Developer Area/Syncing series branches
From Mahara Wiki
< Developer AreaRevision as of 14:37, 20 September 2012 by Melissadraper (talk | contribs) (Created page with "After feature freeze occurs and the new series branch (eg 1.6_STABLE) is made, occasionally you will need to check that stuff you want in the new *_STABLE branch is actually in i…")
Revision as of 14:37, 20 September 2012 by Melissadraper (talk | contribs) (Created page with "After feature freeze occurs and the new series branch (eg 1.6_STABLE) is made, occasionally you will need to check that stuff you want in the new *_STABLE branch is actually in i…")
The printable version is no longer supported and may have rendering errors. Please update your browser bookmarks and please use the default browser print function instead.
After feature freeze occurs and the new series branch (eg 1.6_STABLE) is made, occasionally you will need to check that stuff you want in the new *_STABLE branch is actually in it, not just in master.
it is as simple as git fetch gerrit; git checkout master; git pull; git checkout -b tmp; git rebase -i gerrit/1.6_STABLE (remove the version bump one, and git rebase --skip ones that complain about empty commits); make push same for going from 1.6_STABLE to master, except remove the changelog one then tick tick push for all the patches produced