Julia EvansNov 6, 2023
git rebase: what can go wrong? https://jvns.ca/blog/2023/11/06/rebasing-what-can-go-wrong-/
git rebase: what can go wrong?

git rebase: what can go wrong?

Julia Evans
Show threadpetert
@b0rk thanks for this! Your solution for ‘undoing a rebase’ is going to save me a bunch of time (whenever I do a knarly rebase I’ve been creating a “backup” brach from my starting point and then using that as a “target” for git reset if something goes wrong 😅)
Nov 6, 2023 at 3:36pmWeb
Show threadJulia EvansNov 6, 2023
@petert ooh I think I'll mention the "backup branch" workaround too, that's really smart
Show threadGokul DasNov 6, 2023
@b0rk @petert What happens if the GC runs before you get a chance to undo the rebase? Will be old commit even be there? According to docs, many commands automatically trigger the GC depending upon the repo size. Backup branch may be a safer bet here. (I use the same concept to preserve development history).
Show threadPhil Dennis-JordanNov 6, 2023
@b0rk @petert I use backup branches all the time. After a rebase with merge conflicts, especially when rewriting history, I’ll typically git diff between the rebased branch and the backup just to check I didn’t do anything stupid like drop or duplicate a line.