...
Create a branch with name sketches:
No Format $ git branch sketches
View the list of branches:
No Format $ git branch * master sketches
The star reveals that you are still on the old
master
branch.Switch to the new branch:
No Format $ git checkout sketches Switched to branch 'sketches' $ git branch master * sketches
It is also possible to create a branch and switch immediately to it using the option
-b
ofgit checkout
.Download and add the new file
examples.txt
:No Format $ git add examples.txt $ git commit -m "wrote first examples" [sketches cd63135] wrote first examples 1 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 examples.txt
Inspecting the commit graph with
gitk
(or another graphical viewer) you see that thesketches
branch now has three commits, whilemaster
is still at the second commit.Merging the
sketches
branch intomaster
means that all changes that have been made insketches
are also applied tomaster
. In order to perform this merge, we have to check out themaster
branch first:No Format $ git checkout master Switched to branch 'master' $ git merge sketches Updating 52e2d49..cd63135 Fast-forward examples.txt | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 examples.txt
This was a fast-forward merge: since the
master
branch was completely contained in thesketches
branch, the merge could be done by simply changing the head pointer ofmaster
to be the same as the head ofsketches
.Now add the line "
see some examples in 'examples.txt'
" to the filenotes.txt
and commit this change in the current branch:No Format $ git add notes.txt $ git commit -m "added reference to the new examples" [master a5e244f] added reference to the new examples 1 files changed, 2 insertions(+), 1 deletions(-)
Switch back to the
sketches
branch and modify it as shown below. Note that thecheckout
command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.No Format $ git checkout sketches Switched to branch 'sketches'
Add the line "
Move one step left:
" and write followed by an accordingly updated version of the tape with tape head in the at the end of the fileexamples.txt
, then commit.No Format $ git add examples.txt $ git commit -m "added another example" [sketches 55a9cb1] added another example 1 files changed, 5 insertions(+), 0 deletions(-)
Now your two branches have diverged, which means that they cannot be fast-forwarded anymore.
Merge the
master
branch intosketches
:No Format $ git merge master Merge made by recursive. notes.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
Using
gitk
you can see that a new commit was created that has two parent commits. Such a commit is called merge commit and is done automatically when a non-fast-forward merge is applied. See how both the change tonotes.txt
done in themaster
branch and the change toexamples.txt
done in thesketches
branch are now contained in the repository state that results from the merge.- Add a commit in each of the two branches using the commands you have already learned.
- Check out
master
. Insert the following line after line 4 of
notes.txt
:No Format nopanel true * The finite state machine has an initial state and one or more final states
- Commit the change of
notes.txt
. - Check out
sketches
(make sure to refresh your text editor so thatnotes.txt
is reset to its previous state, without the change made above). Insert the following line after line 4 of
notes.txt
:No Format nopanel true * Each state transition can trigger head movement and data read/write
- Commit the change of
notes.txt
.
- Check out
Merge the
master
branch into the current branch (sketches
):No Format $ git merge master Auto-merging notes.txt CONFLICT (content): Merge conflict in notes.txt Automatic merge failed; fix conflicts and then commit the result.
As expected, the branches could not be merged automatically, since both branches modified the same line in the same file.
Use the
status
command to see the list of affected files:No Format $ git status # On branch sketches # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: notes.txt # no changes added to commit (use "git add" and/or "git commit -a")
The modified
notes.txt
should now contain the following text:No Format nopanel true <<<<<<< HEAD * Each state transition can trigger head movement and data read/write ======= * The finite state machine has an initial state and one or more final states >>>>>>> master
The upper line is the one committed to
sketches
, while the lower line was committed tomaster
. You have to resolve the conflict by editing the file. In this case the conflict is resolved by keeping both lines in arbitrary order, that means you should just remove the conflict markers (lines 5, 7, and 9 innotes.txt
).Use the
add
command to marknotes.txt
as resolved. Enteringgit commit
without a message will open a text editor with an automatically created commit message. Just close the editor, and the merge commit is completed:No Format $ git commit [sketches 21d5ddb] Merge branch 'master' into sketches $ git show 21d5ddb commit 21d5ddbbcba4e36464653a2a550dbf595ead921f Merge: 17f75c7 8af2d50 Author: Miro Spoenemann <msp@informatik.uni-kiel.de> Date: Tue Oct 16 10:44:09 2012 +0200 Merge branch 'master' into sketches Conflicts: notes.txt diff --cc notes.txt index 8f72873,bb81298..ba94a08 --- a/notes.txt +++ b/notes.txt @@@ -2,6 -2,6 +2,7 @@@ * Tape head can read or write data * Tape head can move left or right * The head is controlled by a finite state machine + * Each state transition can trigger head movement and data read/write + * The finite state machine has an initial state and one or more final states see some examples in 'examples.txt'
...