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/dev17.0-vs-deps to main-vs-deps #57303

Closed

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev17.0-vs-deps into main-vs-deps.

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 -t upstream/merges/release/dev17.0-vs-deps-to-main-vs-deps
git reset --hard upstream/main-vs-deps
git merge upstream/release/dev17.0-vs-deps
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.0-vs-deps-to-main-vs-deps --force

JoeRobich and others added 12 commits October 20, 2021 15:00
* Add solution sync time telemetry

* Feedback
* Add solution sync time telemetry

* Feedback

Co-authored-by: Tomáš Matoušek <tmat@users.noreply.github.com>
…assets

Fixes #57293
With recent changes to move OOP to .NET Core, we seem to require specifying analyzer dependencies as analyzer assets. 6c7f97b added MS.CA.Workspaces as an asset, this change extends it to add the C# and VB Workspaces assemblies as analyzer assets.
Add MS.CA.CSharp.Workspaces and MS.CA.VB.Workspaces as VSIX analyzer …
@dotnet-bot dotnet-bot requested a review from a team as a code owner October 21, 2021 17:09
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Oct 21, 2021
@dotnet-bot
Copy link
Collaborator Author

⚠ This PR has merge conflicts. @RikkiGibson

@dotnet-bot dotnet-bot enabled auto-merge October 21, 2021 17:09
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

RikkiGibson and others added 4 commits October 21, 2021 10:25
…se/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
Bump global.json pinned SDK version to NET 6 RC2
…se/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@dotnet-bot dotnet-bot requested a review from a team as a code owner October 21, 2021 22:42
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.

6 participants