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: Mon, 20 Apr 2015 22:23:08 +0300 Message-ID: <838udm61ur.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429557866 10827 80.91.229.3 (20 Apr 2015 19:24:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 19:24:26 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org, dgutov@yandex.ru To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 20 21:24:14 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 1YkHIj-00029J-2V for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 21:24:13 +0200 Original-Received: from localhost ([::1]:55098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHIi-00088V-G4 for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 15:24:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHId-00087N-0w for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:24:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkHIY-0007ev-TZ for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:24:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHIY-0007eQ-QR for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YkHIY-0006ED-EG for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:24: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: Mon, 20 Apr 2015 19:24: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.142955780523894 (code B ref 20292); Mon, 20 Apr 2015 19:24:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 20 Apr 2015 19:23:25 +0000 Original-Received: from localhost ([127.0.0.1]:33856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkHHw-0006DK-Fb for submit@debbugs.gnu.org; Mon, 20 Apr 2015 15:23:24 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:51344) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkHHt-0006D5-D8 for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 15:23:22 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NN400L00DPYIR00@a-mtaout21.012.net.il> for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 22:23:15 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN400L7GDUQFV70@a-mtaout21.012.net.il>; Mon, 20 Apr 2015 22:23:15 +0300 (IDT) In-reply-to: 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:101774 Archived-At: > From: Stefan Monnier > Cc: dgutov@yandex.ru, esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Mon, 20 Apr 2015 15:20:28 -0400 > > > If it is safe to issue this command automatically, we could do > > that in the case of "stash pop" conflict _instead_ of doing "git add" > > in the "normal" merge-conflict case. > > I don't really know what is "safe" in this respect. For my own use, all > of the options we've considered are safe. 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.