June 1, 2026
Merge drama? Git remembers receipts
Using Git's rerere feature to escape recurring conflict hell
Git users just discovered a hidden conflict escape hatch — and the comments are chaos
TLDR: The big news: Git has a little-known feature that remembers how you fixed repeated code clashes, saving you from doing the same cleanup again and again. Commenters were equal parts amazed, embarrassed, and argumentative, with some calling it life-changing and others insisting the real problem is how teams work in the first place.
A quiet little tip about saving your past conflict fixes in Git — the version control tool programmers use to track code changes — somehow turned into a full-blown comment-section therapy session. The article’s big reveal is a feature called rerere, short for “reuse recorded resolution,” which basically means Git can remember how you fixed a messy code clash before and do it again for you next time. For anyone who has ever screamed at their screen while fixing the same merge problem over and over, this landed like a secret cheat code.
And the crowd? Instantly split between “this changes my life” and “every time I think I understand Git, Git humiliates me again.” One commenter admitted they feel competent right up until they learn about yet another hidden feature, which became the thread’s accidental mood. Others went full power-user, dumping giant config tweaks and core developer setups like seasoned survivalists emptying out bug-out bags.
But the real drama came from workflow warriors arguing over how people should work. One side basically said, “Why are you all merging branches like maniacs?” Another declared they avoid this whole mess by pulling changes in only one direction and fixing problems earlier. Translation for normal humans: the article was about a handy fix, but the comments turned into a spicy debate over whether you should even get into this situation in the first place. The funniest running joke was pure programmer despair: Git once again finding a fresh, exciting way to make experienced people feel clueless.
Key Points
- •The article explains that Git’s `rerere` feature records how a user resolves merge conflict hunks and can reuse those resolutions later.
- •`rerere` can be enabled with `git config --global rerere.enabled true`, or by creating the `.git/rr-cache` directory.
- •In the example, a merge conflict occurs in `user.rb` when merging the `dev` branch into `staging`.
- •After the conflict is resolved once and the merge is completed, Git records the resolution and stores data for future reuse.
- •When the same merge is repeated after resetting history, Git automatically resolves the previously seen conflict using the saved resolution.