fix #104698 Make query element of uri survive conflict resolution massaging#104699
Merged
bpasero merged 5 commits intomicrosoft:masterfrom Aug 17, 2020
Merged
fix #104698 Make query element of uri survive conflict resolution massaging#104699bpasero merged 5 commits intomicrosoft:masterfrom
bpasero merged 5 commits intomicrosoft:masterfrom
Conversation
…ution massaging
bpasero
requested changes
Aug 17, 2020
bpasero
requested changes
Aug 17, 2020
Member
bpasero
left a comment
bpasero
left a comment
There was a problem hiding this comment.
Slight change suggested, otherwise looks good to me.
Member
|
Thanks 👍 |
bpasero
added a commit
that referenced
this pull request
Aug 17, 2020
gjsjohnmurray
added a commit
to gjsjohnmurray/vscode
that referenced
this pull request
Aug 17, 2020
…ution massaging (microsoft#104699) * fix microsoft#104698 Make query element of uri survive conflict resolution massaging * Incorporate PR feedback * Simplify * Event simpler, and with comments * Variant preferred by @bpasero
gjsjohnmurray
pushed a commit
to gjsjohnmurray/vscode
that referenced
this pull request
Aug 17, 2020
…ct resolution massaging (microsoft#104699)" This reverts commit 04f2a74.
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.
3 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.
This PR fixes #104698. The fixed code originated with @bpasero