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

Timestamp:

Nov 12, 2018 12:28:49 PM (6 years ago)

Author:

westbrink

Comment:

--

doc/tec/developerrules/svnbranch

@@ -77 +77 @@
 
 1. {{{cd $HOME/palm/branches/<feature_name>}}}
-2. {{{svn update}}} (to obtain HEAD (overall latest) repository revision )
+2. {{{svn update}}} (to obtain HEAD (over[[Image()]]all latest) repository revision )
 3. {{{svn merge -r####:HEAD}}}\\ {{{https://palm.muk.uni-hannover.de/svn/palm/trunk}}}\\(####: branch revision at last merge with trunk)
 4. During update/merge, svn will print an alert in case the same line of code has been modified by the different developers. \\As an example:
@@ -96 +96 @@
 
 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)]]