From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Automatically marking conflicts are resolved Date: Tue, 07 Jan 2014 12:04:42 +0100 Message-ID: <87k3ec59yt.fsf@wanadoo.es> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <871u0k7q9f.fsf@wanadoo.es> <87sit063ta.fsf_-_@wanadoo.es> <87ha9gtyds.fsf@fencepost.gnu.org> <87ob3o62co.fsf@wanadoo.es> <878uustcmo.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389092710 13317 80.91.229.3 (7 Jan 2014 11:05:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 11:05:10 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 12:05:16 2014 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 1W0UT9-0005Tl-8j for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 12:05:11 +0100 Original-Received: from localhost ([::1]:39825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0UT8-0005vP-SX for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 06:05:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0USz-0005tb-FW for emacs-devel@gnu.org; Tue, 07 Jan 2014 06:05:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0USt-00014f-F3 for emacs-devel@gnu.org; Tue, 07 Jan 2014 06:05:01 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:37860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0USt-00014S-7r for emacs-devel@gnu.org; Tue, 07 Jan 2014 06:04:55 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0USr-0004lZ-RN for emacs-devel@gnu.org; Tue, 07 Jan 2014 12:04:53 +0100 Original-Received: from 222.red-83-41-58.dynamicip.rima-tde.net ([83.41.58.222]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 12:04:53 +0100 Original-Received: from ofv by 222.red-83-41-58.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 12:04:53 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 222.red-83-41-58.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:/lqnu32wFAk5Ixu9DWL28uesXIY= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:167588 Archived-At: David Kastrup writes: >> That's not enough and too late. I wont commit the merge without testing >> it first and meanwhile a clear separation of conflicted areas is useful. > > Uh, why would that be too late? Before committing the merge, git diff > lists all merge conflicts. After committing the merge, the information > is in the commit message. The commit can still be amended. > > Whether or not you choose to commit first, test later (after all, a > commit is not the same as an upstream push and can always be amended) or > test first, commit later, the information is readily available. I'm wary of using commits as temporary storage for work-in-progress on merges or any other atomic change. A distraction at the wrong moment may cause big trouble. There is a policy here that says that, except for experimental throw-away projects, all changes must pass some tests before committing them. Also it is convenient to have the diff updated as you work on fixing the merge, with the merge-specific diff indicators.