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.10 to main #51806

Merged
merged 8 commits into from
Mar 12, 2021
Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.10 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.10-to-main
git reset --hard upstream/main
git merge upstream/release/dev16.10
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.10-to-main --force

@dotnet-bot dotnet-bot requested a review from a team as a code owner March 11, 2021 21:01
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Mar 11, 2021
@dotnet-bot
Copy link
Collaborator Author

⚠ This PR has merge conflicts. @allisonchou

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

@allisonchou allisonchou assigned dibarbet and unassigned allisonchou Mar 12, 2021
@allisonchou allisonchou merged commit 24de972 into main Mar 12, 2021
@allisonchou allisonchou deleted the merges/release/dev16.10-to-main branch March 12, 2021 08:03
@allisonchou allisonchou added this to the Next milestone Mar 12, 2021
@allisonchou allisonchou modified the milestones: Next, 16.10.P2 Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants