3 ms·
You actually can distinguish the new lines. For any non-trivial merge conflict resolution committed as part of the merge, `git show $SHA` will actually show you
by eridius 10y ago
You actually can distinguish the new lines. For any non-trivial merge conflict resolution committed as part of the merge, `git show $SHA` will actually show you the conflict resolution. More specifically, if the diff contains anything that's not just a line taken from either of the parents, then that thing is shown.
- pkamb 10y agoYeah, I have no doubt that you can somehow show this information via the command line. The problem is that it's hidden in GitHub's Pull Request web UI, where all of our code review happens. Committing the conflicts and then resolving in the next commit surfaces the conflict resolutions to the PR where it can be reviewed like all of the other code we write.
- deeplyoptional 10y agoThe PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.
- joatmon-snoo 10y agoIf you don't rewrite commit history (it sounds like you don't) you can see it by looking at the diff of the latest commit on the PR. Also, I haven't used it extensively since its release, but doesn't the Reviews feature resolve this now?