Improve 'Conflict Solver' section of manual
Hi I always find the SmartSVN Conflict Solver hard to understand. The terms 'mine' and 'theirs' are, to my mind, non-intuitive. The manual (section 7.4) does not help. It says: "The content of the current file (which contains the conflicts) is displayed in the center text area (“merge view”). The left and right text areas show the contents of the two files, which have been forked from the common base. The common base itself is not displayed, but used by the UI for highlighting changes and conflicts. All file contents are taken directly from the files, which SVN produces in case of conflicting changes." That doesn't help much. I don't understand what the 'common base' stuff means and it doesn't mention 'mine' or 'theirs'. Could WanDisco improve this section of the manual please? David
Hey David, We're planning on making the docs much more readable and easy to understand at whichever point you start reading them. The common base in this scenario will be the last revision at which the two conflicting files matched. This should make it easy to figure out which changes you want to keep.
1-2 of 2
Reply to this discussion
You cannot edit posts or make replies: You should be logged in before you can post.