3 ms·
the command you are looking for is git diff. git status will show you which files changed, git diff will show you where the conflicts are in the files during th
by timtadh 16y ago
the command you are looking for is git diff. git status will show you which files changed, git diff will show you where the conflicts are in the files during the merge.
- saurik 16y agoI am pretty certain in this situation that git diff claims that the submodule directory itself has somehow been modified from the previous commit hash to the new one. Please recognize that the case here is a merge conflict between two people advancing the commit the submodule points to to different revisions of the subproject, not merge conflicts inside of the subproject (which really should not be happening).