This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Add placeholder entry to global.json#37675
Merged
ViktorHofer merged 3 commits intodotnet:masterfrom May 16, 2019
Merged
Conversation
joperezr
reviewed
May 15, 2019
| "msbuild-sdks": { | ||
| "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19264.13", | ||
| "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19264.13", | ||
| "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", |
There was a problem hiding this comment.
I am curious, does 85B6 9C38 mean anything? I thought maybe you were trying to link to the issue number somehow: 36846
Member
Author
There was a problem hiding this comment.
no, it's a random guid to avoid restoring a real package with the name "fix-merge-conflict"
safern
approved these changes
May 15, 2019
Member
safern
left a comment
safern
left a comment
There was a problem hiding this comment.
Unfortunate that we needed to go this route, but is better than solving merge conflicts on every auto-update PR.
|
Lol, it's only fitting that such a PR would have merge conflicts :) |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.
Fixes https://github.com/dotnet/corefx/issues/36846
JSON comments are not supported as we have consumers that don't support that.
This should eliminate the plaguing merge conflicts in global.json