Always rebase on the distant version. #109
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The local version could have commits we don't want in our history. Only when it's pushed do we use the new commits in the history of dependent branches.
pdppp-test1
approved these changes
Oct 20, 2023
It now tries to guess where the ancestor finishes and where the PR starts, and rebases only the PR commits. Notably, this should make opp work with dependent PRs with the squash and merge strategy (but I haven't tried :P)
epot
approved these changes
Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The local version could have commits we don't want in our history.
Only when it's pushed do we use the new commits in the history
of dependent branches.