Hi all,
there have been created the libreoffice-3-3-4 branch. It will be used for fine
tuning of the 3.3.4 bugfix release. It is based on the tag
libreoffice-3.3.4.1 for 3.3.4-rc1 release.
The following rules apply:
+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-3 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything
The 'libreoffice-3-3' branch is still active, will be used for the next
bugfix release (3.3.5). Please read more at
http://wiki.documentfoundation.org/ReleasePlan
http://wiki.documentfoundation.org/Development/Branches
Now, if you want to switch your clone to the libreoffice-3-3-4 branch, please
do:
git pull -r
bin/g pull -r
git checkout -b libreoffice-3-3-4 origin/libreoffice-3-3-4
bin/g checkout -b libreoffice-3-3-4 origin/libreoffice-3-3-4
Hopefully it will work for you :-) Most probably, you will also want to
do (if you haven't done it yet):
git config --global push.default tracking
When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-3-4 when you have switched to it. This will
save you some git shouting at you.
Happy hacking,
Petr
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
