From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Mon, 06 Jan 2014 18:57:19 -0500 Message-ID: References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <871u0k7q9f.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389052655 31863 80.91.229.3 (6 Jan 2014 23:57:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Jan 2014 23:57:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?windows-1252?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 00:57:41 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 1W0K39-0000fu-K5 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 00:57:39 +0100 Original-Received: from localhost ([::1]:38136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0K39-00036C-4J for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 18:57:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0K2y-000352-Ti for emacs-devel@gnu.org; Mon, 06 Jan 2014 18:57:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0K2r-0008Q7-Jm for emacs-devel@gnu.org; Mon, 06 Jan 2014 18:57:28 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:13368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0K2r-0008Q3-Fq for emacs-devel@gnu.org; Mon, 06 Jan 2014 18:57:21 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IPAS-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44297039" Original-Received: from 69-196-161-189.dsl.teksavvy.com (HELO pastel.home) ([69.196.161.189]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 06 Jan 2014 18:57:20 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id DE05062F04; Mon, 6 Jan 2014 18:57:19 -0500 (EST) In-Reply-To: <871u0k7q9f.fsf@wanadoo.es> (=?windows-1252?Q?=22=D3scar?= Fuentes"'s message of "Mon, 06 Jan 2014 22:29:48 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.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:167548 Archived-At: >> and (probably conditional on a config var) [...] > The config var is important. I know some people are very ticklish about it, which is why I mentioned the config var. I think the default should be to have the feature enabled. > 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", 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. Stefan