The reasoning for this decision can be found in issue #160806.įor files with conflicts, users can now select Resolve in Merge Editor to open the 3-way merge editor: Merge editor Opt in to use the 3-way merge editorĪfter reviewing all the merge editor feedback we received and thinking about the experience as a whole, we decided to not show the 3-way merge editor by default (the git.mergeEditor setting is now false) when conflicts are detected. Sorry, your browser doesn't support HTML 5 video. In the video below, the GitLens extension File Annotations menu is hidden from the editor tool bar and then restored via Reset Menu. To restore all menus, run Reset All Menus from the Command Palette ( ⇧⌘P (Windows, Linux Ctrl+Shift+P)). To restore a menu, right-click the tool bar button area and select the Reset Menu command. More Actions menu and can be invoked from there. Right-click on any action in a tool bar and select its hide command or any of the toggle commands. 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. 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 |