Bookmark · 22 April 2022, 12:28 Take the pain out of git conflict resolution: use diff3 – nilbus.com git