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



On Thu, 2010-11-18 at 08:28 -0500, Kohei Yoshida wrote:
Now that we promote the concept of feature branches, I hope we can
revert this.

        We should be using 'git merge' unless it is for a purely local branch
that we are rebasing - surely ? at least - encouraging wider use of
re-base is likely to burn time and motivation - that thing simply
doesn't work for complex cases where there have been multiple merges to
a feature branch [ I got -really- burned with Evolution and a long
running branch here ].

        Or did I totally miss the point ? :-)

        Regards,

                Michael.

-- 
 michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot



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.