Re: auto-merge after push?

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 11, 2009, 23:29 UTC
Message-ID: <alpine.DEB.1.00.0905120128510.27348@pacific.mpi-cbg.de>
In-Reply-To: <20090511211339.GD21045@redhat.com>

Hi,

On Tue, 12 May 2009, Michael S. Tsirkin wrote:

Show 25 quoted lines

> On Mon, May 11, 2009 at 11:03:27PM +0200, Johannes Schindelin wrote:
> 
> > On Mon, 11 May 2009, Michael S. Tsirkin wrote:
> > 
> > > On Mon, May 11, 2009 at 05:18:06PM +0200, Johannes Schindelin wrote:
> > > > The thing is, a merge can fail.  And then you already need direct access 
> > > > to the working directory in question.
> > > > 
> > > > If you were actually talking about fast-forward pushes (because you did 
> > > > the merge locally already), this might help you:
> > > > 
> > > > 	http://thread.gmane.org/gmane.comp.version-control.git/110251
> > > 
> > > Sounds good. But it looks like this patch is unlikely to be merged, does 
> > > it not?
> > 
> > Unlikely to be merged by Junio?  Without success stories, certainly.
> > 
> > But you can do the same as I did: run your local Git with that patch.  I 
> > am actually growing fonder and fonder of denyCurrentBranch=updateInstead.  
> > It works beautifully here.
> > 
> > Of course, I always know what I am doing.
> 
> BTW, what exactly happens on conflict?

With this patch?  The push is refused.

Ciao, Dscho