[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: Óscar Fuentes
Subject: Re: Move to git is imminent - awaiting Stefan's approval
Date: Mon, 06 Jan 2014 22:29:48 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

Stefan Monnier <address@hidden> writes:


> I'd also like:
> - Improve vc-git.el so that it can automatically enable smerge-mode when
>   opening a conflicted file

We discussed a patch for this. IIRC it had the inconvenience of
requiring two git calls for each file, although in theory it was
possible to cache the results for the entire tree.

>   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).

The config var is important.

Here, conflict is considered solved only after testing the changes (does
it compile? does it pass the regression tests?.)


reply via email to

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