3 ms·
The issue is that Git sucks at rebasing. Every conflict you fix when rebasing will need to be fixed again next time you rebase.
by gwenzek 6y ago
The issue is that Git sucks at rebasing. Every conflict you fix when rebasing will need to be fixed again next time you rebase.
- mklein994 6y agoEnter git rerere: https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere This will "REuse REcorded REsolutions" of conflicted merges. Once enabled, it will record how a merge conflict was resolved, and replay it back the next time it encounters it. Saves a lot of time in cases where you already solved the merge once before. https://git-scm.com/book/en/v2/Git-Tools-Rerere https://git-scm.com/book/en/v2/Git-Tools-Rerere
- not_kurt_godel 6y agorerere gives me nightmares. Much prefer some delicate merging footwork if at all possible.
- SassyGrapefruit 6y agoI can confidently say I've never encountered this. To diagnose I'd have to see what exactly you are doing, but I suspect you have issues with the way you organize your work. Git is not a magic wand. Making effective use of a hammer starts with the boards and nails.
- ricardobeat 6y agoTrue, it's one of the downsides. You have to also be in the 'short-lived branches' camp for it to work well - which you should!