Discover Top Posts Tagged with #stacked-branches

Untangling stacked branches in git

A number of people have asked me about ways I use git and “stacked branches,” where in-development work depends on other in-development work. Because of this I decided to record an “untangling” of a big “spaghetti” branch and share it with you all — viewer beware, it’s an hour and half long and works with a complicated branch that went in entirely different directions than originally planned. In…