Hacker News Reader

git rerere --help

once you resolve a conflict git will remember, and do it for you. :-)

I 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.

Reply on news.ycombinator.com