[Libreoffice] Git server-side hooks
kyoshida at novell.com
Fri Nov 19 08:03:21 PST 2010
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 Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>
More information about the LibreOffice