Merge release/2.1.4xx to master #2276
Merged
Conversation
This file contains hidden or 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
… don't copy metadata from simple references
… to a subsequent item
- Correctly handle unresolved conflicts in different passes of the same scope - Log correct messages if unresolved conflicts are subsequently resolved with a new winner
…emblies aren't installed
The UnresolvedConflictHandler now reports all items that were involved in unresolved conflicts, instead of skipping the first one
Putting back the 'perf' property switch
…e/2.1.4xx Merge release/2.1.3xx to release/2.1.4xx
…-conflict-resolution Add references to platform assemblies that win compile conflict resolution
nguerrera
approved these changes
May 29, 2018
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 release/2.1.4xx into master.
git fetch --all git checkout merges/release/2.1.4xx-to-master git reset --hard upstream/master git merge upstream/release/2.1.4xx # Fix merge conflicts git commit git push merges/release/2.1.4xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.