3 ms·
> Is this for a case where a bunch of people branch from master@HEAD (lets call this A), then you need to modify A, so you then need to rebase each branch that
by arxanas 4y ago
> Is this for a case where a bunch of people branch from master@HEAD (lets call this A), then you need to modify A, so you then need to rebase each branch that branched from A individually?
Mainly it's for when you branch from A multiple times, and then modify A. This can happen if you have some base work that you build multiple features on top of. I routinely do this as part of rapid prototyping, as described here: https://github.com/arxanas/git-branchless/wiki/Workflow:-divergent-development https://github.com/arxanas/git-branchless/wiki/Workflow:-div...
`git undo` shows a list of operations it'll execute, which you have to confirm before accepting. Of course, it's ultimately a matter of trust in the tools you use.
- doix 4y agoAh, I should have looked through the wiki. That is cool, I do something similar with a scuffed workflow with lots of cherry-picking. My approach does look significantly worse than this helper though. > `git undo` shows a list of operations it'll execute, which you have to confirm before accepting. Of course, it's ultimately a matter of trust in the tools you use. Nice! I guess it's time to setup rust and check this out. Are you the author? I hope my comments did not come across as too negative. It's more a matter of me living in a git bubble and failing to appreciate the tool.
- arxanas 4y agoYes, I am the author. > I hope my comments did not come across as too negative. Not at all! > guess it's time to setup rust and check this out It's also available on many package managers, such as Homebrew and Nix, although you'd have to build from source for the latest development version.