Archiloque @archiloque CC BY 18/02/2015 Fix conflicts only once with #git rerere▻https://medium.com/@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67 https://d262ilb51hltx0.cloudfront.net/max/1600/1*B4yqMBz48yJh0ZJ0ISEVvw.png Archiloque @archiloque CC BY