-
Notifications
You must be signed in to change notification settings - Fork 4.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds merge editor docs #6130
Adds merge editor docs #6130
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. |
Fixes #5618