Hacker News new | past | comments | ask | show | jobs | submit | from login

Take the pain out of Git conflict resolution: use diff3 (2017) (nilbus.com) 191 points by harporoeder on April 18, 2022 | past | 64 comments Take the pain out of Git conflict resolution: use diff3 (nilbus.com) 2 points by nilbus on Sept 24, 2017 | past

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact Search: