(these posts are part of the material I cover in my devops course) Merge Conflicts Preparations Use your previous knowledge to preoare the following: A repository called demo A branch called feature1 with: a file called file.txt The file has 3 lines with the following content (copy and paste exactly these characters): …

Read More

This is a walkthroug. You are going to create a local repository, and do everything needed to push your work to a remote github repository. Create a local repository Create your local repository by typing: 1git init Config git user name and email (these are not github user and email): 1git config --local user.name …

Read More

(these posts are part of the material I cover in my devops course) What is git merge Let's say you work in your local git repository, and you were doing some work in the work branch: 1$> 2$> git branch 3* work 4$> ls 5work1.txt 6$> You want to add something, but you are not sure it is going to be good, so …

Read More

BASH Arrays See here. Indexed arrays 1names[0]=Yoesf 2names[1]=David 3echo $names # will show: Yosef 4echo ${names[1]} # will show: David Assigning complete arrays: 1-> girlz=(Betty Liza Jane) 2-> echo ${girlz[2]} 3Jane 4-> echo ${girlz} 5Betty 6-> Associative Arrays You have to use declare -A name before: …

Read More

Use this tutorial as an intuitive introduction. The go here and read more details. (this post if part of the material I cover in my devops course) Why Branches Our repository from the previous example has 3 commits and 3 files. Let's say that this is a software project, and our code (those 3 files) is good, and we know …

Read More

(this post if part of the material I cover in my devops course) Adding more commits In the previous post we have created our first commit. It was a new file that we added to our repository let's add more commits: Add file2 that is already in the working directory Add another file, this time inside a directory a change …

Read More

Making sure you remember that we are talking about a local git repository here. That's right, that .git invisible directory, right inside your project directory. (this post if part of the material I cover in my devops course) Locations Consider this cli listing: 1$> 2$> pwd 3/home/osboxes/my-project 4$> ls -la …

Read More

(this is a walk-through, so prepare your computer and let's play around with git) (this post if part of the material I cover in my devops course) Saving Versions in git This is the main thing in a version control system, isn't it? Let's say you have a project, so several files Installing git Git is basically a cli …

Read More

(this post if part of the material I cover in my devops course) A short History of Git As always, the git-scm book (see below) does a great work about that here. To summarize: This is really the history of the creation of the Linux kernel In the early days.....changes to the software were passed around as patches and …

Read More

(this post if part of the material I cover in my devops course) What happened to me when I did a small, single-person home project (this story has not really happen..but it could) Here's what used to happen to me in the past, when I was trying to backup my code. I was working on my files in place A (that was some …

Read More