Looking for the command to merge your changes from your branch up to trunk?
If your branch is 12.x, then you must go to your clean trunk installation, and run:
svn up php doc/devtools/svnbranchupdate.php branches/12.x
And Fix conflicts and commit using
svn commit -F svn-commit.tmp
For more information, see:
- http://dev.tiki.org/Semi-automatic+merging+period#Merging_from_stable_to_trunk
- http://dev.tiki.org/svn+tips#Merging_branch_to_trunk_while_releasing
Other pages related to merging:
10 pages found for title search 'merg'
- Semi-automatic merging period
- Merge Tiki Spreadsheet into Tiki Trackers
- Merge language improvements
- Merge Files
- Merge categories on dev.tiki.org
- Merge a commit from trunk
- Merge a commit between branches
- Mass operations to do after the Semi-automatic merging period
- Mail Merge
- How to Submit a Merge Request
Alias names for this page:
svnmerge
;){kind=link}
;){kind=link}
;){kind=link}
;){kind=link}