From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date: Wed, 11 Nov 2009 21:30:49 GMT
Subject: [PATCH] Re: Clarify documentation on the "ours" merge strategy.
Message-ID: <20091111213049.GJ27518@vidovic>
In-Reply-To: <7vskckn5b4.fsf@alter.siamese.dyndns.org>

The 11/11/09, Junio C Hamano wrote:
> Thomas Rast <trast@student.ethz.ch> writes:
> 
> > ++
> > +Because the sides in a rebase are swapped, using this strategy with
> > +git-rebase is never a good idea.
> 
> Looking very good.

If this strategy is _never_ a good idea in this case, I tend to think
that git should forbid this option, or at least, warn and refer to the
documentation.

-- 
Nicolas Sebrecht