![]() ![]() The merge editor supports word-level merging - as long as the changes don't intersect, both sides can be applied. When closing the merge editor or accepting the merge, a warning is shown if not all conflicts have been addressed. Note how the checkbox updates as expected: ![]() Checkboxes are available to accept and combine changes in Theirs or Yours:Īll language features are available in the merge editor (including diagnostics, breakpoints, and tests), so you get immediate feedback about any issues in the merged result. When enabled, the merge editor can be opened by clicking on a conflicting file in the Source Control view. The merge editor allows you to quickly resolve Git merge conflicts. This feature can be enabled by setting git.mergeEditor to true and will be enabled by default in future releases. In this release, we continued working on the 3-way merge editor. Insiders: Want to try new features as soon as possible? You can download the nightly Insiders build and try the latest updates as soon as they are available. You can find the recording of the event on our YouTube channel. Watch the release party: Listen in as the VS Code team discusses some of the new features. If you'd like to read these release notes online, go to Updates on.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |