Changes between Version 8 and Version 9 of doc/tec/developerrules/svnbranch

Timestamp:

Nov 12, 2018 1:54:16 PM (6 years ago)

Author:

westbrink

Comment:

--

doc/tec/developerrules/svnbranch

@@ -99 +99 @@
 
 To resolve the conflict, we recommend to take file {{{average_3d_data.f90}}}, and manually work through the conflicted lines, \\ which look something like this:
-[[Image(test.png)]]
+[[Image(test.png)]] 
 You could also use kdiff3 of files „left“ and „right“ to visualize the changes at conflicted lines.
 
@@ -154 +154 @@
 * Printing revision information about the local branch copy
    {{{svn info <feature_name>}}}
-
-