We start with one branch: main

Recall: HEAD points to 'where we currently are'

main points to the latest commit on branch

We create a new branch that we name "feature" with git branch feature

This creates a new indicator pointing to where we are.
But HEAD still points to the main branch.

We use git checkout feature to get to the new "feature" branch

The HEAD indicator goes to the feature branch.

2. As dev1 create a short history of commits (minimum two) and push it

cd dev1
echo "a first file" > file1.txt
git add .
git commit -m "Added a first file"
echo "a second file" > file2.txt
git add .
git commit -m "Added a second file"
git push

3. As dev2 pull the information

cd ../dev2
git pull

2. List branches (try to find the appropriate git branch option to do that)

git branch -l

3. Switch to the new branch (use git checkout <branch-name>)

git checkout feature1

New commits affect only the current branch

New commits affect only the current branch

In a big project, e.g. if you're the one working on the feature, changes to main might not be yours (other people push their features/fixes, etc. in the meantime).

Let's switch to the feature branch with git checkout feature

And add some commits while in there

One more

At any point you can return to the main with git checkout main

2. Switch back to the main branch and notice what's going on in your working directory.

ls
git checkout main
ls
(or look at it in Explorer/Finder)

3. Add a file (do not commit it) and try changing branches.

echo "some other text" > some_file.txt
git checkout feature1
What happens? (put it somewhere as part of a new commit and push it)
git add .
git commit -m "New file added to history"

4. As Dev2 execute git pull and check git branch -l

cd ../Dev2
git pull
git branch -l

5. Execute git checkout feature1 and check git branch -l again

git checkout feature1
git branch -l

2. Create a new commit on the feature1 branch

git checkout feature1
echo "another text" > file_dev2feature.txt
git add .
git commit -m "A file added to feature1 by dev2"

3. Run git status on the main branch, push the changes

git checkout main
git status
git push
git status

4. Run git status on the feature1 branch, push the changes

git checkout feature1
git status
git push
git status

While in main do git merge feature

Recall: merge creates a new commit.

You can still work on your feature branch

It doesn't include the merge (unless you also do git merge main while on the branch feature).

Now that we know the basics, let's look again

Can you trace what's been going on in this project?

(Source: Git Better)

2. Merge the feature1 branch to the main branch using git merge <branch-name>. Push.

git checkout main
git merge feature1

Conflict resolution is the same as in the last week's case.

git push

Let's first move to the branch we want to move (git checkout feature)

Then git rebase main

Important: rebase destroys original commits and creates new ones! Probably not a good thing if the original ones were shared with others or in a remote repository!

Possible troublesome situations:

• feature1 branch proved a dead end, but feature2 is promising
• feature2 is actually unrelated to feature1
• main branch introduced something relevant to feature2

The solution is to rebase feature2 to main

git checkout feature2
git rebase --onto main feature1 feature2
`git rebase –onto <new-base> <old-base> <moved-branch>

Let's go back to the large graph

Can you see how rebase could come in handy for the lower feature branch?

(Source: Git Better)