Make sure that git rerere don't try to autosolve merge conflicts to be on the safe side. Just learning for now.