Apply fast-forward update to default branch of forked repo prior to submission#235
Merged
ryfu-msft merged 6 commits intomicrosoft:mainfrom Mar 16, 2022
Merged
Conversation
ryfu-msft
requested review from
a team and
yao-msft
and removed request for
a team
ghost
added
the
ryfu-msft
changed the title
yao-msft
reviewed
Mar 9, 2022
yao-msft
reviewed
Mar 16, 2022
added 2 commits
March 15, 2022 18:03
This was referenced Jul 20, 2022
2 tasks
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
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.
Resolves #233
Resolves #234
GitHub API will throw a NotFoundException when trying to create a reference if the default branch of the forked 'winget-pkgs' repository is not up to date with the latest upstream commits.
The changes in this PR resolve these issues by checking for any upstream commits and updating the fork's default branch prior to submission. The update will only work successfully if the update is only a fast-forward update.
Microsoft Reviewers: Open in CodeFlow