Repository navigation
docs: retarget a stacked PR to main as soon as it is approved - #70
Merged
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #70 +/- ##
=========================================
Coverage 98.27% 98.27%
Complexity 1043 1043
=========================================
Files 123 123
Lines 2606 2606
Branches 301 301
=========================================
Hits 2561 2561
Partials 45 45 Continue to review full report in Codecov by Harness.
🚀 New features to boost your workflow:
|
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
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.
.github/ISSUE_WORKFLOW.mdtold a maintainer to open a pull request againstmain. It said nothing about a pull request stacked on another pull request, so nothing recorded the order the two merges must follow.This adds one note to the fix checklist: retarget a stacked pull request to
mainas soon as a reviewer approves it, and do not wait for its base to merge.Background. In
sdk-py, #75 and #93 were each merged into a base branch that had already merged intomain. Both merges reported success, and neither piece of work reachedmain.delete_branch_on_mergewasfalseon all SDK repositories exceptsdk-csharp, so GitHub never retargeted the stacked pull request.Also done. Automatically delete head branches is now on for
sdk-csharp,sdk-go,sdk-java,sdk-js,sdk-phpandsdk-py. GitHub now retargets a stacked pull request when its base merges. This note keeps the work off that race.Reported in MarketDataApp/sdk-py#117.
Documentation only. No code changes.