Changes between Version 2 and Version 3 of ropp_branches

Timestamp:

2008-03-13T12:07:33Z (16 years ago)

Author:

Huw Lewis

Comment:

Update branch information with resolving conflicts

ropp_branches

@@ -49 +49 @@
 cd ${HOME}/<SVN_working_dir>/<branch name>
 }}}
-For a branch was created at revision ''NNNN'', the following command will merge all changes made in trunk since the branch was created into your branch.
+For a branch was created or last updated at revision ''NNNN'', the following command will merge all changes made in trunk since that revision into your branch.
 {{{
 svn merge -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk
@@ -63 +63 @@
 The merge command can be used separately on subdirectories and files within a branch as required.
 
+If a conflict arises between the local copy of a file and the trunk copy to be merged, several versions of that file will be created (e.g. ''file.f90'', ''file.f90.merge-left.rNNNN'', ''file.f90.merge-right.rMMMM''). In general, you will wish to replace the old version of a file (''file.f90.merge-left.rNNNN'') with the latest version from trunk (''file.f90.merge-right.rMMMM''). This can be done manually, and use the [http://svnbook.red-bean.com/en/1.0/re24.html svn resolved] command to indicate that the conflict has been addressed. This will tidy up the files created on merge.
+
 Further information on branches are available in 
 [http://svnbook.red-bean.com/en/1.0/ch04.html#svn-ch-4-sect-1 SVN reference: Branching and Merging]