From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: auto-merge after push? Date: Tue, 12 May 2009 00:13:39 +0300 Message-ID: <20090511211339.GD21045@redhat.com> References: <20090511142326.GA18260@redhat.com> <20090511201705.GA21045@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Mon May 11 23:14:58 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M3cpt-0008QB-HX for gcvg-git-2@gmane.org; Mon, 11 May 2009 23:14:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757654AbZEKVOm (ORCPT ); Mon, 11 May 2009 17:14:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756913AbZEKVOm (ORCPT ); Mon, 11 May 2009 17:14:42 -0400 Received: from mx2.redhat.com ([66.187.237.31]:32886 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755314AbZEKVOl (ORCPT ); Mon, 11 May 2009 17:14:41 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n4BLEe6b005364; Mon, 11 May 2009 17:14:40 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n4BLEdXW004141; Mon, 11 May 2009 17:14:39 -0400 Received: from redhat.com (vpn-10-19.str.redhat.com [10.32.10.19]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n4BLEbpW004994; Mon, 11 May 2009 17:14:37 -0400 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, May 11, 2009 at 11:03:27PM +0200, Johannes Schindelin wrote: > Hi, > > 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. > > Ciao, > Dscho > > P.S.: :-) BTW, what exactly happens on conflict? -- MST