How to rebase similar to --onto flag? #104
-
|
I had the following stack: develop <- feature-a <- feature-b <- feature-c feature-a was merged into develop, and the commits were squashed. Now, when I rebase the stack, I see a lot of conflicts. So I manually rebased each branch in the stack using Is there a way to do something similar with |
Beta Was this translation helpful? Give feedback.
Replies: 1 comment
-
|
We have a detailed explanation of how we rebase after a squash merge here: https://github.github.com/gh-stack/faq/#how-does-squash-merge-work The key git command: |
Beta Was this translation helpful? Give feedback.
We have a detailed explanation of how we rebase after a squash merge here: https://github.github.com/gh-stack/faq/#how-does-squash-merge-work
The key git command: