On Fri, Nov 19, 2010 at 12:31:14PM +0000, Michael Meeks <michael.me...@novell.com> wrote: > 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 ? :-)
No, you are right. As I mentioned earlier, initially I did not think about multiple developer may work in a feature branch.
pgpryCgYUSef3.pgp
Description: PGP signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
