All is well until you need merges, which is where the confusion happens and minds are lost. - You have a branch `master`. - You have a branch `feature` which

All is well until you need merges, which is where the confusion happens and minds are lost. - You have a branch `master`. - You have a branch `feature` which contains commit C, which conflicts with `master`. - You merge `feature` into `master`, fixing conflicts. - You log the commits of `master`. * First is the merge commit, whose diff contains code added by commit C (including the conflict resolution). * Next you see commit C, whose diff contains code added by commit C (obviously) Wait, how can 2 commits in a row have a diff that modifies the code in the same way? Well, mind you, the diff of a commit doesn't correspond to the moment the patch of the commit was added to the current branch, it only corresponds to the moment it was added to its own branch.