undefined | Better HN

0 pointspkamb9y ago0 comments

Yeah, 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.

0 comments

joatmon-snoo9y ago

If 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?

deeplyoptional9y ago

The PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.

j / k navigate · click thread line to collapse

0 pointspkamb9y ago0 comments

0 comments

joatmon-snoo9y ago

If 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?

deeplyoptional9y ago

The PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.

j / k navigate · click thread line to collapse