| ▲ | karmakaze 4 hours ago | |
This has pretty pictures but its verbosity and frankly made-up complexity is making me not take it as seriously as I perhaps should. The way I'd handle rebasing stacked PRs/branches is to rebase the very last one. Then simply `git branch -f a-branch <logical same point on rebased>` for each of the others, done. I worked on a project that had weekly releases. We had git submodules, and submodules of that, and on rare occasions a 4th repo. I would manually keep those all up to date with rebases pinning each submodule to the logical new points. It all became muscle memory. The lesson I learned is don't use submodules unless you really need to. (All the repos were our own.) JJ may be great but a stawman isn't going to sell it to me. Now I can tell an AI to rebase a stack and as long as there weren't any conflicts easily check the results. Everyone has things that bug them, git isn't one of mine (today :-). Instead I have a custom keyboard layout that no one else uses that makes me feel better, but I don't go around telling everyone they should switch--unless you're curious[0]. | ||