Peter Bautista on Nostr: npub1upkp7…4tcwy ok here's a git rebase scenario I often struggle with. I have ...
npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) ok here's a git rebase scenario I often struggle with.
I have branch A off `main`. Later I make branch B off branch A.
branch A gets a pull request, get's merged into main. I now go to branch B and try to `rebase main` and nearly always get a conflict.
At that point I usually do my trick of just making a branch C off master and pulling in the changes from B, but I always wonder why the rebase doesn't just work.
I have branch A off `main`. Later I make branch B off branch A.
branch A gets a pull request, get's merged into main. I now go to branch B and try to `rebase main` and nearly always get a conflict.
At that point I usually do my trick of just making a branch C off master and pulling in the changes from B, but I always wonder why the rebase doesn't just work.