From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dmitry Gutov 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 20:04:27 +0200 Message-ID: <25fddd5b-9a1f-230a-eae5-10ba287db626@yandex.ru> References: <83h977fi3p.fsf@gnu.org> <834m36f6ai.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1479406665 11170 195.159.176.226 (17 Nov 2016 18:17:45 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 17 Nov 2016 18:17:45 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 Cc: gitster@pobox.com, 20292@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 17 19:17:42 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 1c7RFk-0002Nb-UY for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Nov 2016 19:17:41 +0100 Original-Received: from localhost ([::1]:60828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7RFo-0008A7-8Y for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Nov 2016 13:17:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7R3Z-00070L-Rv for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 13:05:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7R3W-00023W-Nu for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 13:05:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:45529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c7R3W-00023B-JZ for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 13:05:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1c7R3V-0000KO-NL for bug-gnu-emacs@gnu.org; Thu, 17 Nov 2016 13:05:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Nov 2016 18:05: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.14794058771223 (code B ref 20292); Thu, 17 Nov 2016 18:05:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 17 Nov 2016 18:04:37 +0000 Original-Received: from localhost ([127.0.0.1]:60928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7R36-0000Jf-Qs for submit@debbugs.gnu.org; Thu, 17 Nov 2016 13:04:36 -0500 Original-Received: from mail-wm0-f48.google.com ([74.125.82.48]:36179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7R35-0000JT-Jq for 20292@debbugs.gnu.org; Thu, 17 Nov 2016 13:04:35 -0500 Original-Received: by mail-wm0-f48.google.com with SMTP id g23so327038571wme.1 for <20292@debbugs.gnu.org>; Thu, 17 Nov 2016 10:04:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=yOPvxNKM7yvwdq2kph3F92CqibYMBB6v0PHU7dzlElw=; b=fi9RXWqNzVffFI8W8/qTeyena7zJg4WJ/yWgJUCDqiewR6dgUR5B9fpJez/rpYIAEJ j7vHJgngdk0tNCRAT2TV1WAZDt4o+3Xqq307RYoTnCeykH9pJCT/JEDHY/eX+u4tiCEG XbKDm9O9cUp8EF9v0V4yyylBLwAGDXuv/tMnJAhnv0ykOVAbxbUTgG2omfo6YFOU63Y9 K2++YXDWakyx01U2v9ddziklDypNXO9qkRh+uPcOwnhVuN5N6okltPjbDhD3mKDWYfQo CRSoKNWHQQN8SW03SeUAPHJdg+YQVPZGpm+e1CiWMwmBQuXDmYipHEBkYB5cYEoeG+4f jSUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=yOPvxNKM7yvwdq2kph3F92CqibYMBB6v0PHU7dzlElw=; b=B3YXzw0v2nXSX14WCYq2YrZTHyLyPb0nAEKu1tErFaIUD9aHSwO9b8GPa4BCQMOYOp xICllyCR4pS3j/++/PeCemCsIEd4EzU1LvVSFpiHz3B5jfm3vSyGgAneuFYT3qg7f4DM 7EigxUEbdExzZzQvl3/68UaHM5S9MowafHC0la2FPyqnueAwzyPjsBhqVA9y9PhOPlQ3 dbAlTL6b1aCzdsypr2xZ4QE8RsRr1EKeGM24vEhfz45h/hgC05Qe6bM1ImdlksaVkQqR J2aiZEpKn8msFPJmZkFFGnfc6z5mAbIEzCk+4VPXaLzp+LzaD80yK0o9u8lE2QUga8VQ /94w== X-Gm-Message-State: AKaTC033nEyQU2hrX5bKJhz1BDZoHOddCbK63f+KcFv4ZLrGR2tZARvXzTKAEFhDotLlTQ== X-Received: by 10.28.63.3 with SMTP id m3mr5834611wma.113.1479405869858; Thu, 17 Nov 2016 10:04:29 -0800 (PST) Original-Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id d17sm4509581wjr.14.2016.11.17.10.04.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 10:04:29 -0800 (PST) In-Reply-To: <834m36f6ai.fsf@gnu.org> Content-Language: en-US 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:125798 Archived-At: On 17.11.2016 17:57, Eli Zaretskii wrote: > Thanks. I don't understand why it is not on the tracker, I guess it > wasn't actually sent there, for some reason. The bug had been archived up to the same day. Although the request to unarchive it was sent before the email in question. Or maybe the time zones conspired to make that false. >> 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. He indeed complained about the default value.