Anyone know why git rerere is not enabled by default? I just learned about it recently, and it could have saved me so much time merging new releases into a long-running fork
-
Anyone know why git rerere is not enabled by default? I just learned about it recently, and it could have saved me so much time merging new releases into a long-running fork
-
The name makes it kind of hard to find, too. I tried searching for it many times in the past using searches like "replay merge conflict resolution", but since git replay is actually a thing that does something else entirely, I didn't find it
-
@jesseplusplus It’s baffling. I’ve probably shown that config to 50 people by now.
Many of which were coworkers manually re-resolving merge conflicts while rebasing, or saying they didn’t use rebasing because they didn’t like resolving conflicts for every commit.
Or saying they just made single commits on PRs because they didn’t want to deal with conflicts when rebasing.
UGH
Very interested in what you find out. Maybe it’s because auto-magic scares people?
-
@olivierlacan so many good use cases! This definitely goes on my list of personal default configs.
I haven’t gotten any other explanations yet, but the automagic being scary sounds very plausible. I’ve only very occasionally had a bad merge happen in git, but I certainly wouldn’t want one of those times to be something that happens automatically without me realizing where it came from.. that would be a nightmare to hunt down!
