From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 16 Nov 2009 12:35:13 GMT
Subject: Re: [PATCH 3/3] rebase: refuse to rebase with -s ours
Message-ID: <alpine.DEB.1.00.0911161333470.4985@pacific.mpi-cbg.de>
In-Reply-To: <efd7770d166a97481e8e31e407b9c2da02a341e5.1258309432.git.trast@student.ethz.ch>

Hi,

On Sun, 15 Nov 2009, Thomas Rast wrote:

> Using the "ours" strategy with rebase just discards all changes, turning 
> <branch> into <upstream> (or <newbase> if given).  This is unlikely to 
> be what the user wants, so simply refuse to do it.

"Unlikely" or "impossible"?

Besides, I find it rather arbitrary that the "ours" strategy is refused, 
but none of the user-provided merge strategies.  IOW disallowing "ours" 
may very well foster unreasonable expectations.

Ciao,
Dscho