4 ms·
Painless Merge Conflict Resolution in Git
- aeontech 16y agoI spent an hour this morning trying to find this link again, because I was convinced I read it on HN yesterday. Turns out I didn't read it on HN, so here it is. I found this approach very useful when I had to do a couple KLOC merge last night.
- peterbotond 16y agogit rerere --help once you resolve a conflict git will remember, and do it for you. :-)
- aeontech 16y agoI know about rerere, this is about taking the guesswork out of that initial resolution and making it more logical, especially when merging someone else's code.