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: Sun, 19 Apr 2015 21:05:05 +0300 Message-ID: <83r3rg56zy.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429466845 23846 80.91.229.3 (19 Apr 2015 18:07:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 18:07:25 +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 Sun Apr 19 20:07: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 1Yjtcf-0006Bu-Eh for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 20:07:13 +0200 Original-Received: from localhost ([::1]:49280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjtce-0005rb-Ic for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 14:07:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjtca-0005qi-VC for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:07:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjtcU-000413-2U for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:07:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjtcU-00040t-0B for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YjtcT-0002zC-Lv for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:07:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Apr 2015 18:07: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.142946677111418 (code B ref 20292); Sun, 19 Apr 2015 18:07:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 19 Apr 2015 18:06:11 +0000 Original-Received: from localhost ([127.0.0.1]:60877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjtbf-0002y5-Dg for submit@debbugs.gnu.org; Sun, 19 Apr 2015 14:06:11 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:48425) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjtbc-0002xr-VM for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 14:06:10 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NN200300F5S8V00@a-mtaout20.012.net.il> for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 21:05:14 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN20022IFKQY460@a-mtaout20.012.net.il>; Sun, 19 Apr 2015 21:05:14 +0300 (IDT) In-reply-to: <5533E816.2090208@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:101732 Archived-At: > Date: Sun, 19 Apr 2015 20:38:30 +0300 > From: Dmitry Gutov > CC: esr@snark.thyrsus.com, 20292@debbugs.gnu.org > > On 04/19/2015 08:06 PM, Eli Zaretskii wrote: > > > I meant when "git stash pop" reports conflicts, in particular after a > > "git pull" or "git merge". > > That's the general case. > > > I think we were talking about the same use case, but I cannot be sure, > > since "has staged changes" might me more general than what I had in > > mind. > > No: it's more specific. Before you do 'git stash pop', either there's > nothing in the staging area (and the conflict is most likely due to some > new commits), or there is something in the staging area. > > "one has staged changes in one of the involved files" means the latter. > > > Before "git stash save"? The case I had in mind didn't have anything > > staged before that. > > No, after "git stash save", but before "git stash pop". I was talking about the following simple scenatio: git pull # get an error about uncommitted changes that prevent merge git stash save git pull git stash pop # get an error message about conflicts # resolve conflicts and save de-conflicted files