From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: Automatically marking conflicts are resolved Date: Tue, 07 Jan 2014 01:43:27 +0100 Organization: Organization?!? Message-ID: <87ha9gtyds.fsf@fencepost.gnu.org> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <871u0k7q9f.fsf@wanadoo.es> <87sit063ta.fsf_-_@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1389055426 26786 80.91.229.3 (7 Jan 2014 00:43:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 00:43:46 +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:43:53 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 1W0Kls-0002us-RL for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 01:43:52 +0100 Original-Received: from localhost ([::1]:38258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Kls-0005zd-FX for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 19:43:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Klk-0005zT-Ig for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:43:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0Klf-0004JA-9K for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:43:44 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:58408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Klf-0004J1-1r for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:43:39 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0Kle-0002Iw-3M for emacs-devel@gnu.org; Tue, 07 Jan 2014 01:43:38 +0100 Original-Received: from x2f5214e.dyn.telefonica.de ([2.245.33.78]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 01:43:38 +0100 Original-Received: from dak by x2f5214e.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 01:43:38 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f5214e.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:tDBH81vUBQ5zGZPuX3OVivdShk4= 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:167558 Archived-At: Óscar Fuentes writes: > Stefan Monnier writes: > >>> Here, conflict is considered solved only after testing the changes (does >>> it compile? does it pass the regression tests?.) >> >> When Git resolves concurrent changes automatically, it doesn't mark the >> file as "there was an unchecked change in here", > > Right, so you must consider everything as unchecked changes. > >> so for the same reason >> I think the default behavior of vc-git + smerge-mode should be to remove >> the "conflicted" mark on files after the user has removed all >> diff3 markers. > > 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. -- David Kastrup