3 ms·
git rerere --help once you resolve a conflict git will remember, and do it for you. :-)
by peterbotond 16y ago
git 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.