Changes

# To keep up to date, simply type

svnmerge.py merge

<source lang="bash">

svn ci -F svnmerge-commit-message.txt

== Merging the branch back into the main line ==

# or update a previously checked out version,

svn up

#Then commit the change

svn ci -F svnmerge-commit-message.txt

To merge the branch and commit the changes, type

svnmerge.py merge -bidirectional

svn ci -F svnmerge-commit-message.txt

Finally the merge properties need to be removed

# and your private branch deleted

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

== See also ==

[[Category:git]]