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: Thu, 17 Nov 2016 17:57:25 +0200 Message-ID: <834m36f6ai.fsf@gnu.org> References: <83h977fi3p.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1479399259 7440 195.159.176.226 (17 Nov 2016 16:14:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 17 Nov 2016 16:14:19 +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 Thu Nov 17 17:14:12 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 1c7PKF-00013I-Ni for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Nov 2016 17:14:11 +0100 Original-Received: from localhost ([::1]:59981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7PKI-000154-JH for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Nov 2016 11:14:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7P4h-0004qA-Jx for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 10:58:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7P4c-00064J-O7 for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 10:58:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:45447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c7P4c-00064F-LZ for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 10:58:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1c7P4c-0005Rf-DK for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 10:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Nov 2016 15:58:02 +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.147939825620890 (code B ref 20292); Thu, 17 Nov 2016 15:58:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 17 Nov 2016 15:57:36 +0000 Original-Received: from localhost ([127.0.0.1]:60845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7P4B-0005Qr-Ul for submit@debbugs.gnu.org; Thu, 17 Nov 2016 10:57:36 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:38316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7P4A-0005Qc-5W for 20292@debbugs.gnu.org; Thu, 17 Nov 2016 10:57:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7P41-0005x5-0a for 20292@debbugs.gnu.org; Thu, 17 Nov 2016 10:57:29 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7P40-0005x0-Sz; Thu, 17 Nov 2016 10:57:24 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1496 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1c7P40-0003PC-4x; Thu, 17 Nov 2016 10:57:24 -0500 In-reply-to: (message from Dmitry Gutov on Thu, 17 Nov 2016 00:45:43 +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:125787 Archived-At: > Cc: gitster@pobox.com, 20292@debbugs.gnu.org > From: Dmitry Gutov > Date: Thu, 17 Nov 2016 00:45:43 +0200 > > > I don't even see the message you are responding to. Was it sent only > > to you, Dmitry? > > It was addressed to both me and the bug email, but didn't arrive at the > latter. I'm attaching the full message here. Thanks. I don't understand why it is not on the tracker, I guess it wasn't actually sent there, for some reason. > >> 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? > > vc-git-resolve-conflicts is already a user option. My impression was that Juno, for some reason, finds that insufficient. But if I misunderstood, and the issue is only with its default value, then indeed I see no problem.