News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by joatmon-snoo on Monday December 12, 2016 @06:29PM (#13163088)
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?

There are no comments on this comment yet.