Merge master to master-vs-deps #51326
Merged
Conversation
This file contains 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
…tudioProjectFactory.cs Co-authored-by: Jason Malinowski <[email protected]>
* Create second XAML LSP client without DisableUserExperience set and toggle between them via feature flag * Share capabilities between the clients
…LanguageServer.cs
…se/dev16.10 Merge release/dev16.9 to release/dev16.10
Remove dependency on internal VS utility apis.
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
JoeRobich
removed
the
Merge Conflicts
Merge release/dev16.10 to master
Expose async entrypoint for IWorkspaceProjectContextFactory
Optimize option lookup allocations
|
@dibarbet could you please address the merge conflicts/build failures in this PR? Feel free to blow away the attempted conflict resolution and push your own resolution up if that is convenient. |
JoeRobich
force-pushed
the
merges/master-to-master-vs-deps
branch
from
f73cd8f
to
d4c970a
Compare
…er-to-master-vs-deps
JoeRobich
force-pushed
the
merges/master-to-master-vs-deps
branch
from
d4c970a
to
ea7b88f
Compare
ghost
merged commit 
ghost
added this to the 
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from master into master-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 merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-master-vs-deps --force