![]() Note that Base refers to the file version that the local and the repository versions originated from (initially displayed in the middle pane), while Middle refers to the resulting version.Ĭlick this button to apply all non-conflicting changes. Press Ctrl to change or to or and append changes.Ĭlick this icon to invoke the list of options allowing you to compare different versions of a file to resolve a conflict. The chevron buttons can change their behavior:Ĭlick and to apply changes. ![]() The active pane has the cursor.Īpply differences between panes (in case of the side-by-side viewer) or between lines (in case of the unified viewer). Switch between the panes of the differences viewer. Open a browser and show the corresponding help page. Select this checkbox if you want to include the file you've reviewed into the commit. This checkbox only appears if you invoke the Differences Viewer from the Commit Changes dialog with multiple changed files (all of which are deselected), and you explore the differences between them and hit the last difference in a file. These commands are also available from the context menu of the differences viewer gutter. If this button is released, each of the panes can be scrolled independently. To open the Diff
0 Comments
Leave a Reply. |