[Libreoffice] Git server-side hooks
kyoshida at novell.com
Fri Nov 19 06:17:26 PST 2010
On Fri, 2010-11-19 at 12:31 +0000, Michael Meeks wrote:
> 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 ].
Yes, that's exactly the point I was trying to make (to make rebase
optional, not default), and I believe this is what we are going to do.
The problem was that rebasing was forced even when you didn't specify it
during git pull.
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>
More information about the LibreOffice