| Next | Join my army of git zombies! | 26 |
Branching is useless without merging
Git's merging is really good
Git can resolve a great many conflicting changes itself
But in this example, the conflict requires human intervention
(Blackberries, or raspberries?)
(We might have to call in the lawyers)
| Next | |
https://perl.plover.com/yak/git-intro/ |