[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Move to git is imminent - awaiting Stefan's approval

From: Thierry Volpiatto
Subject: Re: Move to git is imminent - awaiting Stefan's approval
Date: Tue, 07 Jan 2014 06:24:51 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

Stefan Monnier <address@hidden> 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.


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.

Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]