Update merge-conflict extension #128662
Open
Update merge-conflict extension #128662
+62
−22
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
Remove "Accept Both" options when resolving merge conflicts Add options to resolve conflicts as both changes, in any order
|
|
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.
Inspired by Atom's options to resolve merge conflicts: "Resolve as Ours then Theirs" and "Resolve as Theirs then Ours"
-Remove "Accept Both" options when resolving merge conflicts
-Add options to resolve conflicts as "Both Changes", in both orders
This allows for greater granular control over the order of the code applied, in cases where incoming changes need to come before existing changes for functionality or prettification.
P.S: Had some trouble testing the extension with vsce, as it comes pre-packaged with vscode, so for now it remains untested.
Code changes are minimal and shouldn't break anything. Hopefully someone can point out how to test this out (if there's an easier way than building vscode entirely!)
I openly welcome any reviews, changes and improvements as this is my first time working with ts!