2 ms·
> git-rerere > will prevent you from getting stuck resolving the same merge conflicts repeatedly, by remembering how you resolved them the last time. That's o
by JoshTriplett 13y ago
> git-rerere
> will prevent you from getting stuck resolving the same merge conflicts repeatedly, by remembering how you resolved them the last time.
That's on by default these days; if you re-do a merge and git finds the conflict in rerere, it'll automatically use the saved resolution rather than inserting conflict markers.