Adds merge editor docs #6130
Merged
Adds merge editor docs #6130
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
isidorn
reviewed
Mar 13, 2023
| @@ -115,6 +115,38 @@ If you open a folder that is a Git repository and begin making changes, VS Code | |||
|
|
|||
| Merge conflicts are recognized by VS Code. Differences are highlighted and there are inline actions to accept either one or both changes. Once the conflicts are resolved, stage the conflicting file so you can commit those changes. | |||
|
|
|||
| ## 3 Way Merge Editor | |||
There was a problem hiding this comment.
Can we add short paragraph that explains what a merge editor is and why should people use it?
There was a problem hiding this comment.
Have a look at #6131, which added an opening sentence to tie the above merge conflicts section to the 3-way merge editor.
We could add more details
There was a problem hiding this comment.
Yes, I really like that!
I would not add more details yet. Let's wait and see how do the users react :)
Thanks all!
|
For future reference, the docs from this PR are now available at Source control > Overview > 3-way merge editor. |
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.
Fixes #5618