Changes between Version 5 and Version 6 of doc/tec/developerrules/svnbranch

Timestamp:

Nov 12, 2018 12:22:23 PM (6 years ago)

Author:

westbrink

Comment:

--

doc/tec/developerrules/svnbranch

@@ -92 +92 @@
 |||| average_3d_data.f90.[[span(style=color: blue, merge-left.r2046)]] |||| (your code was used at conflicted line in merged file) ||
 |||| average_3d_data.f90.[[span(style=color: blue, merge-right.r2735)]] |||| (their code was used at conflicted line in merged file) ||
-|||| average_3d_data.f90.[[span(style=color: blue, working)]]. |||| (your unmerged file version) ||
+|||| average_3d_data.f90.[[span(style=color: blue, working)]] |||| (your unmerged file version) ||
 |||| average_3d_data.f90  |||| (your + their code at conflicted line in merged file) ||
 
+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:
 
-
-
-