Using Git's rerere feature to escape recurring conflict hell
Summary
The gist explains using Git's rerere feature to automatically reuse previous merge conflict resolutions. It walks through enabling rerere, demonstrates a merge scenario, shows rerere diff outputs, and illustrates applying a recorded resolution to complete merges with minimal manual intervention.