Fix conflicts only once with git rerere — Medium

/fix-conflicts-only-once-with-git-rerere