From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!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: Wed, 22 Apr 2015 04:50:14 +0300 Message-ID: <5536FE56.406@yandex.ru> References: <83fv88ta5r.fsf@gnu.org> <5532ADA3.5000006@yandex.ru> <834mod6xnm.fsf@gnu.org> <5532D397.8090602@yandex.ru> <83zj645gxu.fsf@gnu.org> <5533D7B8.7060508@yandex.ru> <83sibw59q1.fsf@gnu.org> <5533E816.2090208@yandex.ru> <83r3rg56zy.fsf@gnu.org> <5533EFE5.2050101@yandex.ru> <83oamk561p.fsf@gnu.org> <5533F446.4020400@yandex.ru> <83fv7u6epr.fsf@gnu.org> <838udm61ur.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1429667487 7632 80.91.229.3 (22 Apr 2015 01:51:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Apr 2015 01:51:27 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292-done@debbugs.gnu.org To: Stefan Monnier , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 22 03:51:15 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ykjoo-0001XD-6q for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 03:51:14 +0200 Original-Received: from localhost ([::1]:60962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ykjon-0004BQ-4e for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 Apr 2015 21:51:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ykjoj-00048h-20 for bug-gnu-emacs@gnu.org; Tue, 21 Apr 2015 21:51:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ykjoc-0007WT-Nq for bug-gnu-emacs@gnu.org; Tue, 21 Apr 2015 21:51:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ykjoc-0007WL-Kd for bug-gnu-emacs@gnu.org; Tue, 21 Apr 2015 21:51:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ykjoc-0002RD-82 for bug-gnu-emacs@gnu.org; Tue, 21 Apr 2015 21:51:02 -0400 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Apr 2015 01:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 20292@debbugs.gnu.org, dgutov@yandex.ru, eliz@gnu.org Original-Received: via spool by 20292-done@debbugs.gnu.org id=D20292.14296674259234 (code D ref 20292); Wed, 22 Apr 2015 01:51:01 +0000 Original-Received: (at 20292-done) by debbugs.gnu.org; 22 Apr 2015 01:50:25 +0000 Original-Received: from localhost ([127.0.0.1]:35659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ykjo0-0002Oo-4J for submit@debbugs.gnu.org; Tue, 21 Apr 2015 21:50:24 -0400 Original-Received: from mail-wg0-f47.google.com ([74.125.82.47]:35145) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ykjnx-0002OR-Gg for 20292-done@debbugs.gnu.org; Tue, 21 Apr 2015 21:50:22 -0400 Original-Received: by wgyo15 with SMTP id o15so231526660wgy.2 for <20292-done@debbugs.gnu.org>; Tue, 21 Apr 2015 18:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=hGGHsgtCDtCeTYB53L7B73PA+Tb8T29Ldbj0sr0XLtc=; b=nPLvWQ3J5ZxklceU1VmcbxoopX5J2UXbeGxvljyPUG5T6UUB8FSN1u/QtMmefmBME4 1YhWX2mNbUXqGtu/lr2GCCuOIbf5ebzZpUST+Y472mJbCcTRcWKx44NdxMdefQVCAh+M EDqEmpeMZ/l007ITgx1UUJqNxaVIWsGBl4EXaZ5PAk2RK5gHYRstNHSLf3GsPouYE0w4 4IcsSydFnPKw6tjTqcYnlOcyEh2CVi/esW5nXWFQ7vWPe+o11c7T9fyaLfik66ZFyLl0 xqI4+ssk8b1JLsJtNKoLvKewknZ5U9tlAxZ771KOfTw7vWSGGvVvkD0/lFArSVtFXvzz KuoA== X-Received: by 10.194.93.195 with SMTP id cw3mr46913536wjb.150.1429667415700; Tue, 21 Apr 2015 18:50:15 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id e18sm5005921wjz.27.2015.04.21.18.50.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 18:50:15 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:101852 Archived-At: On 04/21/2015 04:06 AM, Stefan Monnier wrote: >> Then my vote is for using "git add FILE" with conflicts during a >> merge, and "git reset HEAD FILE" with conflicts during "stash pop". >> I think this is the simplest solution and is easy to implement with >> minimal changes. > > Fine by me, I've pushed this, together with the choosing logic suggested previously. Apparently it's the best we can do.