[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "
bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file
Wed, 16 Nov 2016 19:30:02 +0200
> From: Dmitry Gutov <address@hidden>
> Date: Wed, 16 Nov 2016 02:25:32 +0200
> Sorry for the late reply. Too bad neither of your emails were recorded
> in the bug report thread
I don't even see the message you are responding to. Was it sent only
to you, Dmitry?
> The ability to 'git diff' which you have described seems fairly obscure
> to me and the majority of Emacs/Git users, so even if we make
> vc-git-resolve-conflicts default to nil, it's unlikely that the majority
> of users will really benefit from that.
> You, as a core Git developer, represent the informed minority, and as
> such, it's probably not too much to expect that you and the others can
> customize vc-git-resolve-conflicts to nil without much trouble.
Perhaps there could be a way to customize vc-git so that it caters to
such advanced users?