| Next | Join my army of git zombies! | 19 |
Branching is useless without merging
Git's merging is really good
Git can resolve a lot of merge conflicts itself
For example, file foo was renamed and modified
But in this example, the conflict requires human intervention
(Blackberries, or raspberries?)
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 |