I think the last two images in the Conflicts section of novice/git are in the wrong place.
The image git-after-second-conflicting-change.svg should be used before the merge takes place, and should be replaced by git-after-merging.svg. Also, the (currently unused) image git-after-pushing-merge.svg is the one that should be used at the very end after pushing the merged changes to GitHub, not git-after-merging.svg.
I think the last two images in the Conflicts section of novice/git are in the wrong place.
The image
git-after-second-conflicting-change.svg
should be used before the merge takes place, and should be replaced bygit-after-merging.svg
. Also, the (currently unused) imagegit-after-pushing-merge.svg
is the one that should be used at the very end after pushing the merged changes to GitHub, notgit-after-merging.svg
.