SVN updates (for all versions of Tiki) will stop in January 2023. This coincides with when Tiki18 reaches end of life. However, even if you use another version (like Tiki 21x) from SVN, you will stop getting updates because the Git and SVN combined workflow will be retired. You should get your updates from Git. See also: Tiki Version control history.
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:
12 pages found for title search 'merg'
- Semi-automatic merging period
- Merging branches in Git
- 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
- Guidelines for Merge Request reviewers
Alias names for this page:
svnmerge
;){kind=link}
;){kind=link}
;){kind=link}
;){kind=link}