From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 20:33:36 +0200 Message-ID: <83h9fy4b27.fsf@gnu.org> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> <83poum4g1y.fsf@gnu.org> <83oaa64f7l.fsf@gnu.org> <56F18D10.1040208@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458671661 24439 80.91.229.3 (22 Mar 2016 18:34:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 18:34:21 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 19:34:21 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiR8G-0007NL-0z for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 19:34:20 +0100 Original-Received: from localhost ([::1]:38906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR8F-00027w-3G for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 14:34:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR7w-00025L-Oe for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:34:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiR7t-00033T-KL for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:34:00 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR7t-00033O-Gx; Tue, 22 Mar 2016 14:33:57 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4341 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiR7s-0003Hl-Ep; Tue, 22 Mar 2016 14:33:56 -0400 In-reply-to: <56F18D10.1040208@cs.ucla.edu> (message from Paul Eggert on Tue, 22 Mar 2016 11:21:04 -0700) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202089 Archived-At: > Cc: emacs-devel@gnu.org > From: Paul Eggert > Date: Tue, 22 Mar 2016 11:21:04 -0700 > > On 03/22/2016 10:03 AM, Eli Zaretskii wrote: > >> "git rebase" should do the trick. > > We've been through this: "git rebase" will cause much worse trouble if > > you have local merge-commits from feature branches. So I at least > > will never use "git rebase" unless I have no other choice. > > For complex clashes such as the one you describe, you might try redoing > the failed push from a clean new master branch rather than attempting > "git pull / git push". Something like this: > > $ git push > [ fails due to somebody else committing in the meantime ] > $ git branch -m master master-clashed > $ git branch --track master origin/master > $ git checkout master > $ git pull > [ now, merge your changes again ] > $ git push Thanks, but I don't see why I should bother with such complications, when no one cares about the DAG keeping a clear "mainline".