Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork215
fix(action): allow merging cpython on existing branch#110
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
mattwang44 merged 1 commit intopython:3.9frommattwang44:fix/sync-workflow/edit-on-branchSep 13, 2021
Merged
fix(action): allow merging cpython on existing branch#110
mattwang44 merged 1 commit intopython:3.9frommattwang44:fix/sync-workflow/edit-on-branchSep 13, 2021
Uh oh!
There was an error while loading.Please reload this page.
Conversation
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
josix approved these changesSep 13, 2021
beccalzh pushed a commit to beccalzh/python-docs-zh-tw that referenced this pull requestSep 4, 2024
…on-branchfix(action): allow merging cpython on existing branch
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
2 participants
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.
[WHY]
The procedure in current workflow for cpython-syncing is listed as follow:
However, if any commit is added in the step 2. and the cpython-syncing job is triggered before step 3., the commit(s) will be eliminated when forced-pushing since the current workflow do not editing based on existing branch.
[HOW]
Add a stage for reseting to existing branch. If the branch does not exist, this stage would fail but does not block the job.