Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi Marco,

On 2012-04-24 at 22:45 +0200, Thorsten Behrens wrote:

Btw, what is LibreOffice policy for rebasing a feature branch ?

I'd defer to Kendy here. :)

Oh - whatever works best for you :-)  Either just develop without
rebasing and rebase once before pushing to master, or create
feature/branch2 that contains the rebased stuff, and remove the
feature/branch on the server, or merge from master from time to time,
and rebase once before merging to master, to cleanup the history.

There's of course a possibility to just push to master, and not to use a
feature branch at all :-) [my preferred, as it gets testing early].

As you can see, we prefer linear history without merges, so if you
really want to use a feature branch, I think the first 2 are the
safest / most convenient to achieve linear history.

Regards,
Kendy


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.