Learned git rerere. Just enabled it and it remembered my conflict resolutions.