Fix conflicts only once with git rerere
Christophe Porteneuve

Very cool article

I very recently wrote a similar article here, have you already seen it by any chance☺? It was written with a rebasing use case in mind, but it’s nice to see other instances where it can be used. You might especially be interested in rerere-train script as another way to share/discover resolutions.


One clap, two clap, three clap, forty?

By clapping more or less, you can signal to us which stories really stand out.