From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Tue, 07 Jan 2014 06:24:51 +0100 Organization: Emacs Helm Message-ID: <8761pwxt24.fsf@gmail.com> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389072315 27889 80.91.229.3 (7 Jan 2014 05:25:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 05:25:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 06:25:22 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 1W0PAH-0001VV-KG for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 06:25:21 +0100 Original-Received: from localhost ([::1]:38905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0PAH-0008ND-6L for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 00:25:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0PA9-0008Mz-CK for emacs-devel@gnu.org; Tue, 07 Jan 2014 00:25:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0PA3-0000oj-UW for emacs-devel@gnu.org; Tue, 07 Jan 2014 00:25:13 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:54482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0PA3-0000oS-Oh for emacs-devel@gnu.org; Tue, 07 Jan 2014 00:25:07 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0PA0-0000tK-B5 for emacs-devel@gnu.org; Tue, 07 Jan 2014 06:25:04 +0100 Original-Received: from 37.163.200.8 ([37.163.200.8]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 06:25:04 +0100 Original-Received: from thierry.volpiatto by 37.163.200.8 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 06:25:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 37.163.200.8 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:RqvkqRUfCdG61e/1SExPrwOFlsk= 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:167567 Archived-At: Stefan Monnier writes: >> The above is not enough. I would suggest to have the following >> additional steps, before the switch: > > Sounds right. > > I'd also like: > > - Improve vc-git.el so that it can automatically enable smerge-mode when > opening a conflicted file and (probably conditional on a config var) > mark the file as "not conflicted any more" when saving with no > remaining diff3 markers. > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). > > - Improve vc-git.el with vc-git-conflicted-files so that > vc-find-conflicted-files works for Git as well. You can use git-mergetool with ediff-merge for this. http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool When git fail to merge and signal a conflict, run git-mergetool in e.g eshell will bring you a new frame with ediff-merge to resolve the conflict manually, always worked fine for me. -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997