search

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.
Other
299 stars 383 forks source link

Images in the Conflicts section of novice/git are in the wrong place #573

Closed ctjacobs closed 10 years ago

ctjacobs commented 10 years ago

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.

rgaiacs commented 10 years ago

Closing it since #574 was merge.