On Fri, Nov 19, 2010 at 11:03:21AM -0500, Kohei Yoshida <kyosh...@novell.com> wrote: > 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... :-/
Don't worry, in the past there were no git merge, and just pull. :) Then later it got split to fetch + merge to make git more distributed (fetch is always a trivial operation, then you can merge whenever you want, even when you're offline). :)
pgpueikOdapMf.pgp
Description: PGP signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
