Changes between Version 30 and Version 31 of code/tools/SVN

Timestamp:

Mar 12, 2013, 1:39:08 PM (11 years ago)

Author:

bknecht

Comment:

—

code/tools/SVN

@@ -9 +9 @@
 There are many SVN clients, the two below are just examples. Of course you can use whatever client you like. A client with a graphical user interface however might protect you from mistakes due to mistyped commands.
  * Windows: [http://tortoisesvn.tigris.org/ TortoiseSVN]
- * Linux/Tardis: [http://rapidsvn.tigris.org/ RapidSVN] (is already installed on Tardis computers at ETH and can also be found in your distribution's repository)
+ * Linux/Tardis: [http://www.rabbitvcs.org/ RabbitVCS] (is already installed on Tardis computers at ETH and can also be found in your distribution's repository)
 }}}
 
@@ -166 +166 @@
 <h3 style="margin:0;" id="resolved">resolved</h3>
 }}}
-If a conflict arises - this normally happens if someone changes a file on the server (committed it) while you were doing changes in the same place. This command '''does not solve''' the conflict, but it removes the other unnecessary files.
+If a conflict arises - this normally happens if someone changes a file on the server (committed it) while you were doing changes in the same place. This command '''does not solve''' the conflict, but it removes the other unnecessary files. To resolve the conflict use a diff tool to look at and edit the different versions next to each other. On Tardis we suggest {{{meld}}}, which even allows three way comparisons.
 
 The syntax is ''svn resolved <conflicting file>''