deeplyoptional·10 yıl önce·discussThe PR UI does this. After resolving conflicts, the resulting merge commit will show just the resolution.