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 01:51:35 +0100 Message-ID: <87ob3o62co.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389055918 32038 80.91.229.3 (7 Jan 2014 00:51:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 00:51:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 01:52:04 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 1W0Ktn-0002zI-O6 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 01:52:03 +0100 Original-Received: from localhost ([::1]:38280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Ktn-0007uS-Dr for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 19:52:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Ktf-0007tE-EN for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:52:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0KtZ-0006Z3-Jv for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:51:55 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:52864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0KtZ-0006Yz-Do for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:51:49 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0KtW-0002MV-Qk for emacs-devel@gnu.org; Tue, 07 Jan 2014 01:51:46 +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 01:51:46 +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 01:51:46 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 12 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:R0eaBvqy8APmiwe0w6QCT8htLng= 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:167559 Archived-At: David Kastrup writes: >> On the compile/test phase it is useful to know which problems comes from >> the automatic merge and which ones comes from the areas you edited while >> resolving the conflicts. > > The commit message proposed by Git lists the merge conflicts. While the > committer may remove this list, it is usually a good idea to keep it, > for exactly that reason. 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.