Fix #45853 #47886
Merged
Fix #45853 #47886
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
|
Thanks @andrewtomai ! When I use the merge conflict code lenses I sometimes want to stay at the conflict after I have chosen a resolution because I need to fix things up. Only sometimes I want to move on immediately. A setting doing either one or the other wouldn't work too well for me. It would be better if we had an easy way to navigate to the next conflict after the current one is resolved through one of the actions and possible edited. Related: #47884 |
|
I suggest to change #47884 to add toolbar items to the editor when there are merge conflicts instead of the proposed change here. That will allow the user to continue editing the result of the merge action and then navigate to the previous/next merge conflict easily. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Issue #45853
Automatically navigate to the next merge conflict when you resolve the current conflict. Added a default setting to the user settings JSON, under the Merge Conflict settings to allow the user to disable this feature if they so choose.