Developer Area/Syncing series branches

From Mahara Wiki
Jump to navigation Jump to search

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.

<aquaghost> it is as simple as
<aquaghost> 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
<aquaghost> same for going from 1.6_STABLE to master, except remove the changelog one
<aquaghost> then tick tick push for all the patches produced