Re:Resolve simple merge conflicts on GitHub
by deeplyoptional on Monday December 12, 2016 @05:53PM
(#13162815)
The PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.
[ Parent
| on HN ]
There are no comments on this comment yet.