Fullscreen
[Show/Hide Right Column]

Print

Merge a commit to trunk

Say you commit a fix to a stable branch (ex.: 8x), and you want to merge that commit to trunk (ex.: future 9x)

In this example, we'll merge the commit in branches/8.x (revision 39486) to trunk.

  1. Checkout trunk -> get code
  2. From the trunk directory (you may have to do 'cd trunk')
    Merge revision from branches/8.x to the current checkout (which happens to be trunk)
    svn merge -c 39486 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/8.x
  3. Commit 
    svn commit -m "[merge/r39486] minor text corrections" INSTALL



Related:

Page last modified on Wednesday 25 January, 2012 23:27:30 UTC

SourceHistoryComments

Search Wishes (subject only) [toggle]

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.