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.8 to master #49420

Merged
4 commits merged into from
Nov 17, 2020
Merged

Merge release/dev16.8 to master #49420

4 commits merged into from
Nov 17, 2020

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.8 into master.

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.8-to-master
git reset --hard upstream/master
git merge upstream/release/dev16.8
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.8-to-master --force

sharwell and others added 3 commits November 13, 2020 17:04
This change ensures that SolutionAssetStorage does not release a pinned
data scope while it is still in use.

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1240987

(cherry picked from commit 745ddaf)
Use lazy cancellation in RemoteEndPoint.InvokeAsync<T>
@dotnet-bot dotnet-bot requested a review from a team as a code owner November 17, 2020 00:07
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Nov 17, 2020
@ghost
Copy link

ghost commented Nov 17, 2020

Hello @dotnet-bot!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

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 removed the Merge Conflicts There are merge conflicts with the base branch. label Nov 17, 2020
@RikkiGibson
Copy link
Contributor

@jasonmalinowski
Copy link
Member

#49402 was recently merged that removed the skip; is the bug still there or do we need to update a toolset somewhere?

@ghost ghost merged commit 4d8cada into master Nov 17, 2020
@ghost ghost deleted the merges/release/dev16.8-to-master branch November 17, 2020 21:57
@ghost ghost added this to the Next milestone Nov 17, 2020
@allisonchou allisonchou modified the milestones: Next, 16.9.P2 Nov 24, 2020
This pull request was closed.
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.

5 participants