From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Thu, 14 May 2015 11:51:24 -0400 Message-ID: References: <83fv88ta5r.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> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1431618744 14546 80.91.229.3 (14 May 2015 15:52:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 15:52:24 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 14 17:52:11 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 1YsvQh-00060C-28 for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 17:52:11 +0200 Original-Received: from localhost ([::1]:55290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsvQg-0001tZ-F2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 11:52:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsvQd-0001qu-Bu for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 11:52:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsvQY-00040m-1z for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 11:52:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsvQX-00040W-VR for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 11:52:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsvQX-00029o-NG for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 11:52:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2015 15:52: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.14316187138269 (code B ref 20292); Thu, 14 May 2015 15:52:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 15:51:53 +0000 Original-Received: from localhost ([127.0.0.1]:45240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsvQN-00029H-Vb for submit@debbugs.gnu.org; Thu, 14 May 2015 11:51:52 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:56550) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsvQM-000296-31 for 20292@debbugs.gnu.org; Thu, 14 May 2015 11:51:50 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id C584585E8D; Thu, 14 May 2015 11:51:48 -0400 (EDT) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 377A71E5B8D; Thu, 14 May 2015 11:51:24 -0400 (EDT) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id 17AD2B41A0; Thu, 14 May 2015 11:51:24 -0400 (EDT) In-Reply-To: <834mnfjjlz.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 14 May 2015 17:53:44 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca 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:102792 Archived-At: > May I ask why you have uncommitted changes when you pull (or do > whatever else requires to stash them)? Typical case: - before committing, I do a final "pull". - the "pull" fails, so I have to stash/pull/unstash - the commit touches several files and has a conflict somewhere. > Why don't you commit them or move them to a branch, or work on > a branch to begin with? Old habits die hard, Stefan