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: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 17:46:15 +0300 Message-ID: <838uc8yd3c.fsf@gnu.org> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432824489 16607 80.91.229.3 (28 May 2015 14:48:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 14:48:09 +0000 (UTC) Cc: michael.albinus@gmx.de, emacs-devel@gnu.org To: bruce.connor.am@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 16:48:00 2015 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 1Yxz6F-0000gP-8z for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 16:47:59 +0200 Original-Received: from localhost ([::1]:59392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxz69-0002NH-80 for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 10:47:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxz5n-0002Kj-Gb for emacs-devel@gnu.org; Thu, 28 May 2015 10:47:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxz5k-0002RN-92 for emacs-devel@gnu.org; Thu, 28 May 2015 10:47:31 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:52589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxz5j-0002R6-SW for emacs-devel@gnu.org; Thu, 28 May 2015 10:47:28 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NP200300DXHQL00@mtaout25.012.net.il> for emacs-devel@gnu.org; Thu, 28 May 2015 17:42:13 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NP2002L6E6C6520@mtaout25.012.net.il>; Thu, 28 May 2015 17:42:13 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:186905 Archived-At: > Date: Thu, 28 May 2015 10:27:15 +0100 > From: Artur Malabarba > Cc: emacs-devel > > As a general tip. Next time you try to pull and find out someone > already has already done what you just did, don't resolve the merge > conflict. Instead, abort the merge with `git merge --abort` (this will > get you back to the state you had right before the pull), and then > locally revert your commit. I don't see how this advice will be able to keep Michael out of trouble next time. AFAICT, it will just get him in a different situation, one that isn't simpler or safer to deal with. Locally reverting commits risks losing them, for example. OTOH, merge conflicts are nothing to be afraid of, the procedure to handle them is simple and straightforward. Michael (and every one else here) should IMO master that simple procedure, instead of avoiding it. In a dVCS, you cannot rely on being able to avoid merges all the time anyway. There are always races with other developers.