Changes for page Git

Last modified by Richard Kreissig on 2025/01/30 12:03

From version < 29.1 >

edited by msp
on 2012/10/15 15:42

To version < 30.1 >

edited by msp
on 2012/10/16 10:56

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)
Objects (1 modified, 0 added, 0 removed)
- Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Content

@@ -158,7 +158,7 @@
  It is also possible to create a branch and switch immediately to it using the option {{code language="none"}}-b{{/code}} of {{code language="none"}}git checkout{{/code}}.
  )))
 . (((
--Add the new file [[attach:examples.txt]]:
++Download and add the new file [[attach:examples.txt]]{{code language="none"}}{{/code}}:
  {{noformat}}
  $ git add examples.txt
@@ -167,4 +167,159 @@
 files changed, 20 insertions(+), 0 deletions(-)
   create mode 100644 examples.txt
  {{/noformat}}
++
++Inspecting the commit graph with {{code language="none"}}gitk{{/code}} (or another graphical viewer) you see that the {{code language="none"}}sketches{{/code}} branch now has three commits, while {{code language="none"}}master{{/code}} is still at the second commit.
  )))
++1. (((
++Merging the {{code language="none"}}sketches{{/code}} branch into {{code language="none"}}master{{/code}} means that all changes that have been made in {{code language="none"}}sketches{{/code}} are also applied to {{code language="none"}}master{{/code}}. In order to perform this merge, we have to check out the {{code language="none"}}master{{/code}} branch first:
++
++{{noformat}}
++$ 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
++{{/noformat}}
++
++This was a //fast-forward// merge: since the {{code language="none"}}master{{/code}} branch was completely contained in the {{code language="none"}}sketches{{/code}} branch, the merge could be done by simply changing the head pointer of {{code language="none"}}master{{/code}} to be the same as the head of {{code language="none"}}sketches{{/code}}.
++)))
++1. (((
++Now add the line "{{code language="none"}}see some examples in 'examples.txt'{{/code}}" to the file {{code language="none"}}notes.txt{{/code}} and commit this change in the current branch:
++
++{{noformat}}
++$ 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(-)
++{{/noformat}}
++)))
++1. (((
++Switch back to the {{code language="none"}}sketches{{/code}} branch and commit something there. Note that the {{code language="none"}}checkout{{/code}} command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.
++
++{{noformat}}
++$ git checkout sketches
++Switched to branch 'sketches'
++{{/noformat}}
++
++Add the line "{{code language="none"}}Move one step left:{{/code}}" and write an updated version of the tape with tape head in the file {{code language="none"}}examples.txt{{/code}}, then commit.
++
++{{noformat}}
++$ git add examples.txt
++$ git commit -m "added another example"
++[sketches 55a9cb1] added another example
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++{{/noformat}}
++
++Now our two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
++)))
++1. (((
++Merge the {{code language="none"}}master{{/code}} branch into {{code language="none"}}sketches{{/code}}:
++
++{{noformat}}
++$ git merge master
++Merge made by recursive.
++ notes.txt |    3 ++-
++ 1 files changed, 2 insertions(+), 1 deletions(-)
++{{/noformat}}
++
++Using {{code language="none"}}gitk{{/code}} 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.
++)))
++1. (((
++Add a commit in each of the two branches using the commands you have already learned.
++1. Check out {{code language="none"}}master{{/code}}.
++1. (((
++Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
++
++{{noformat nopanel="true"}}
++ * The finite state machine has an initial state and one or more final states
++{{/noformat}}
++)))
++1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
++1. Check out {{code language="none"}}sketches{{/code}} (make sure to refresh your text editor so {{code language="none"}}notes.txt{{/code}} is reset to its previous state, without the change made above).
++1. (((
++Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
++
++{{noformat nopanel="true"}}
++ * Each state transition can trigger head movement and data read/write
++{{/noformat}}
++)))
++1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
++)))
++1. (((
++Merge the {{code language="none"}}master{{/code}} branch into the current branch ({{code language="none"}}sketches{{/code}}):
++
++{{noformat}}
++$ git merge master
++Auto-merging notes.txt
++CONFLICT (content): Merge conflict in notes.txt
++Automatic merge failed; fix conflicts and then commit the result.
++{{/noformat}}
++
++As expected, the branches could not be merged automatically, since both branches modified the same line in the same file.
++)))
++1. (((
++Use the {{code language="none"}}status{{/code}} command to see the list of affected files:
++
++{{noformat}}
++$ 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")
++{{/noformat}}
++)))
++1. (((
++The modified {{code language="none"}}notes.txt{{/code}} should now contain the following text:
++
++{{noformat 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
++{{/noformat}}
++
++The upper line is the one committed to {{code language="none"}}sketches{{/code}}, while the lower line was committed to {{code language="none"}}master{{/code}}. 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 in {{code language="none"}}notes.txt{{/code}}).
++)))
++1. (((
++Use the {{code language="none"}}add{{/code}} command to mark {{code language="none"}}notes.txt{{/code}} as resolved. Entering {{code language="none"}}git commit{{/code}} without a message will open a text editor with an automatically created commit message. Just close the editor, and the merge commit is completed:
++
++{{noformat}}
++$ 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'
++{{/noformat}}
++)))
++
++The {{code language="none"}}gitk{{/code}} tool should now display this graph:
++
++[[image:attach:turing-graph-01.png]]
++
++

Confluence.Code.ConfluencePageClass[0]

Id

@@ -1,1 +1,1 @@
--2982132
++2982134

URL

@@ -1,1 +1,1 @@
--https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982132/Git
++https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982134/Git

Changes for page Git

Summary

Details

Navigation

Quick Links