To apply changes made in the left file ( Theirs), right click on the changed lines and select Context Menu → Use text block from 'theirs'. Then the changes from the left file are added to the right file. Sometimes you actually want both text blocks, and the context menu also offers you Context Menu → Use both text blocks (this one first) and Context Menu → Use both text blocks (this one last). You can also edit the output file just as you would in a text editor. Such lines are marked using a pencil icon. But most of time I want to compare whitespaces too, because merging is easier then, identing changes are shown too. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseGitMerge to keep track of the relationship to the original files. But trailing whitespaces add differences which are hard to spot without enabling View Whitespace. If you're in three pane view (sometimes called merge view) you can only edit the file in the bottom view ( Merged). Compare whitespaces includes all changes in indentation and inline whitespace as added/removed lines. ![]() As in two pane view, you can right click on conflicted lines and either select Context Menu → Use text block from 'theirs' or Context Menu → Use text block from 'mine'. Ignore whitespace changes excludes changes which are due solely to a change in the amount or type of whitespace, e.g. In addition, if you want both blocks, you can select Context Menu → Use text block from 'mine' before 'theirs' or Context Menu → Use text block from 'theirs' before 'mine'.Īdding whitespace where there was none before, or removing a whitespace completely is still shown as a change.Ĭhanging the indentation or changing tabs to spaces. According to the command you've selected, the changes are used in the resulting Merged file. ![]() Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseGitMerge there are no conflicts shown. ![]() This may be due to the whitespace handling you have chosen. ![]() If you choose to ignore line-endings or whitespace changes, those lines will be marked using the Conflict-Ignored icon.
0 Comments
Leave a Reply. |