2 ms·
400 commits not cleanly applying? Not a big deal. I routinely merge 1000-2000 commits and rebase 30 active branches to that also. The solution is git rerere. It
by rurban 10y ago
400 commits not cleanly applying? Not a big deal. I routinely merge 1000-2000 commits and rebase 30 active branches to that also. The solution is git rerere. It stores all the resolved merge resolutions forever, and cp or rb apply cleanly then, without any trouble.
Eg
https://medium.com/@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67#.8pj73vnex https://medium.com/@porteneuve/fix-conflicts-only-once-with-...