From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!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, 22 Apr 2015 10:35:46 +0300 Message-ID: <83egnc4nu5.fsf@gnu.org> 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> <5536FE56.406@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429688190 31822 80.91.229.3 (22 Apr 2015 07:36:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Apr 2015 07:36:30 +0000 (UTC) Cc: esr@snark.thyrsus.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 Apr 22 09:36:18 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 1YkpCd-0004oR-0D for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 09:36:11 +0200 Original-Received: from localhost ([::1]:33628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkpCb-0000zU-Ud for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 03:36:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkpCY-0000zP-IF for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 03:36:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkpCV-0003zV-Bd for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 03:36:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkpCV-0003zP-9K for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 03:36:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YkpCU-0006kP-MV for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 03:36:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Apr 2015 07:36: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.142968816025928 (code B ref 20292); Wed, 22 Apr 2015 07:36:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 22 Apr 2015 07:36:00 +0000 Original-Received: from localhost ([127.0.0.1]:35721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkpCR-0006k7-Sh for submit@debbugs.gnu.org; Wed, 22 Apr 2015 03:36:00 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:41927) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkpCN-0006jr-9p for 20292@debbugs.gnu.org; Wed, 22 Apr 2015 03:35:56 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NN7004006685600@a-mtaout21.012.net.il> for 20292@debbugs.gnu.org; Wed, 22 Apr 2015 10:35:49 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN7004UC6FO1N80@a-mtaout21.012.net.il>; Wed, 22 Apr 2015 10:35:48 +0300 (IDT) In-reply-to: <5536FE56.406@yandex.ru> X-012-Sender: halo1@inter.net.il 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:101855 Archived-At: > Date: Wed, 22 Apr 2015 04:50:14 +0300 > From: Dmitry Gutov > CC: esr@snark.thyrsus.com, 20292-done@debbugs.gnu.org > > 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. Thanks, this does TRT in my use cases.