From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Wed, 16 Nov 2016 19:30:02 +0200 Message-ID: <83h977fi3p.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1479317474 17130 195.159.176.226 (16 Nov 2016 17:31:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 16 Nov 2016 17:31:14 +0000 (UTC) Cc: gitster@pobox.com, 20292@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 16 18:31:09 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c743A-0003IO-Kk for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Nov 2016 18:31:08 +0100 Original-Received: from localhost ([::1]:53723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c743E-0004xz-24 for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Nov 2016 12:31:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7438-0004xt-9M for bug-gnu-emacs@gnu.org; Wed, 16 Nov 2016 12:31:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7434-000593-A2 for bug-gnu-emacs@gnu.org; Wed, 16 Nov 2016 12:31:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:44425) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c7434-00058v-6o for bug-gnu-emacs@gnu.org; Wed, 16 Nov 2016 12:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1c7433-0003h4-Um for bug-gnu-emacs@gnu.org; Wed, 16 Nov 2016 12:31:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Nov 2016 17:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20292-submit@debbugs.gnu.org id=B20292.147931741414137 (code B ref 20292); Wed, 16 Nov 2016 17:31:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 16 Nov 2016 17:30:14 +0000 Original-Received: from localhost ([127.0.0.1]:59824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c742I-0003fx-Dp for submit@debbugs.gnu.org; Wed, 16 Nov 2016 12:30:14 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c742G-0003fi-U2 for 20292@debbugs.gnu.org; Wed, 16 Nov 2016 12:30:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7427-0004qV-N8 for 20292@debbugs.gnu.org; Wed, 16 Nov 2016 12:30:07 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7427-0004qR-KU; Wed, 16 Nov 2016 12:30:03 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4365 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1c7426-00037W-Pk; Wed, 16 Nov 2016 12:30:03 -0500 In-reply-to: (message from Dmitry Gutov on Wed, 16 Nov 2016 02:25:32 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:125761 Archived-At: > From: Dmitry Gutov > 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 > (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20292). 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?