-
Notifications
You must be signed in to change notification settings - Fork 3.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebase from squashed merge #276
Labels
Comments
Sounds good to me! Labelled this accordingly, hope someone else takes it up. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Where I work, we've started a general policy to always squash merge our PRs. Sometimes I base new feature branches on unmerged PRs, and once those PRs are squash merged, it makes rebasing my feature branches back onto the master branch a bit more difficult.
Luckily I found this link which remedies the problem pretty well:
https://makandracards.com/makandra/45964-git-rebase-dependent-feature-branch-after-squash
I figured this would probably be a good candidate to add to the git flight rules. I just don't have time at the moment to make PR on this or I would have already. But I just wanted to put this up on the radar so maybe someone else or myself can add it at a later time.
Thanks!
The text was updated successfully, but these errors were encountered: