Recently I came across a very interesting post from Christophe Porteneuve on Medium, in which git rerere was introduced. The “rerere” stands for Reuse Recorded Resolution and this means that the resolution of conflicts is recorded and can be used again if necessary.
For me an so far unknown, but very helpful git command. I hope it helps you, so you don’t have to solve the same conflicts all the time.
The original documentation for git rerere can be found here.