Changes

svn up

</source>

Then svnmerge.py can be utilised again. First initialise the merging process by typing, from within the checked out copy of the main line,

<source lang="bash">

#Then commit the change

svn ci -F svnmerge-commit-message.txt

To merge the branch and commit the changes, type

<source lang="bash">

svn ci -F svnmerge-commit-message.txt

</source>

Finally the merge properties need to be removed

<source lang="bash">

# the changes committed

svn ci -F svnmerge-commit-message.txt

svn rm svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH

</source>

== See also ==

[[Category:git]]