Fix conflicts only once with git rerere Fixing conflicts is chore enough not to do the same ones over and over again. See how rerere makes Git remember your con… Click to view the original at medium.com
