Next Join my army of git zombies! 19

Merging branches

Branching is useless without merging

Git's merging is really good

Git can resolve a lot of merge conflicts itself

But in this example, the conflict requires human intervention

     git merge experiment
     git status
     cat pie
     ... resolve conflict ...
     git diff
     git add pie
     git commit
     git log --decorate --all --graph

Next Copyright © 2011 M. J. Dominus