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: Move to git is imminent - awaiting Stefan's approval Date: Tue, 07 Jan 2014 18:22:35 +0200 Message-ID: <83eh4jsqwk.fsf@gnu.org> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <8761pwxt24.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1389111777 20200 80.91.229.3 (7 Jan 2014 16:22:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 16:22:57 +0000 (UTC) Cc: emacs-devel@gnu.org, thierry.volpiatto@gmail.com To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 17:23:03 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 1W0ZQk-0005Wv-J1 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 17:23:02 +0100 Original-Received: from localhost ([::1]:41565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ZQk-0004Wc-4U for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 11:23:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ZQb-0004O1-C1 for emacs-devel@gnu.org; Tue, 07 Jan 2014 11:22:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0ZQU-0006UR-OG for emacs-devel@gnu.org; Tue, 07 Jan 2014 11:22:53 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:49242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ZQU-0006U6-Gn for emacs-devel@gnu.org; Tue, 07 Jan 2014 11:22:46 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MZ100800HED1I00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Tue, 07 Jan 2014 18:22:44 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZ1007RHHHVZ120@a-mtaout20.012.net.il>; Tue, 07 Jan 2014 18:22:44 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:167620 Archived-At: > From: Stefan Monnier > Date: Tue, 07 Jan 2014 08:45:47 -0500 > Cc: emacs-devel@gnu.org > > while I'd be happy to take patches to better support git-mergetool > (if needed), I prefer using the vc-find-conflicted-files workflow. Same here. It's so dead easy that it's hard to beat: just visit the offending file (which is automatically put in SMerge mode), edit to resolve the conflict and remove the conflict markers, then save -- and the VC back-end will automatically do whatever it takes to finish conflict resolution.