Git does indeed remember conflict resolutions (if the ReReRe feature is enabled), but in practice it's only helped me a handful of times. (And I am big on obse

Git does indeed remember conflict resolutions (if the ReReRe feature is enabled), but in practice it's only helped me a handful of times. (And I am big on obsessively rebasing and cleaning up history before pushing a change.)