Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev16.11 to main #54121

Merged
merged 3 commits into from
Jun 16, 2021
Merged

Merge release/dev16.11 to main #54121

merged 3 commits into from
Jun 16, 2021

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.11 into main.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout merges/release/dev16.11-to-main
git reset --hard upstream/main
git merge upstream/release/dev16.11
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.11-to-main --force

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@genlu genlu merged commit 4fb8c42 into main Jun 16, 2021
@ghost ghost added this to the Next milestone Jun 16, 2021
@genlu genlu deleted the merges/release/dev16.11-to-main branch June 16, 2021 18:18
@dotnet-bot dotnet-bot restored the merges/release/dev16.11-to-main branch June 16, 2021 21:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.11-to-main branch June 16, 2021 21:01
@RikkiGibson RikkiGibson modified the milestones: Next, 17.0.P2 Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants