4 ms·The PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.by deeplyoptional 10y agoThe PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.