Hacker News new | ask | show | jobs
by deeplyoptional 3480 days ago
The PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.