Require PR branches to rebase onto current dev - #3557
Draft
reachjalil wants to merge 1 commit into
Draft
Conversation
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
upstream/devbefore PR publication or update--force-with-leasefor already-published feature branches and stop on lease failuredevinto feature branches, and rewriting shared or uncoordinated branchesWhy
Keeping feature history linear and based on current
devreduces avoidable integration conflicts and makes the exact reviewed base explicit.Verification
git diff --checkupstream/dev@ee1c5a67588e3c3aa1dce60a11cd8a9e2548e8f4upstream/devis the branch merge baseHead:
038fb8bef475808586918f9551b2965529b45b74