On Fri, 2010-11-19 at 12:31 +0000, Michael Meeks wrote:
We should be using 'git merge'
So, part of the problem was that I was always using git pull, even where
git merge would've been appropriate.
To be honest, I didn't even know of 'git merge' until now. I always
thought pull was merge in git universe... :-/
Kohei
--
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida@novell.com>
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.