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: Thu, 14 May 2015 17:53:44 +0300 Message-ID: <834mnfjjlz.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> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431615337 20599 80.91.229.3 (14 May 2015 14:55:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 14:55:37 +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 Thu May 14 16:55:27 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 1YsuXi-00068K-E0 for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 16:55:22 +0200 Original-Received: from localhost ([::1]:55044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsuXh-00068o-Nq for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 10:55:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsuXa-00063G-H4 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 10:55:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsuXO-0003ON-94 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 10:55:14 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsuXO-0003Nw-6V for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 10:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsuXO-0006gE-0V for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 10:55: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: Thu, 14 May 2015 14:55: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.143161525825559 (code B ref 20292); Thu, 14 May 2015 14:55:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 14:54:18 +0000 Original-Received: from localhost ([127.0.0.1]:45143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsuWf-0006eA-OV for submit@debbugs.gnu.org; Thu, 14 May 2015 10:54:18 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:44518) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsuWd-0006dp-Rm for 20292@debbugs.gnu.org; Thu, 14 May 2015 10:54:16 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NOC00000H6Q8H00@a-mtaout22.012.net.il> for 20292@debbugs.gnu.org; Thu, 14 May 2015 17:53:47 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOC00NRNHDN5370@a-mtaout22.012.net.il>; Thu, 14 May 2015 17:53:47 +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:102783 Archived-At: > From: Stefan Monnier > Cc: Dmitry Gutov , esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Wed, 13 May 2015 23:49:25 -0400 > > > is better than it was before the change. Also note that conflicts > > like this are quite rare, > > It's about 99.9% of my "unstash-caused conflicts", so "rare" obviously > depends on how you use Git. Indeed. May I ask why you have uncommitted changes when you pull (or do whatever else requires to stash them)? Why don't you commit them or move them to a branch, or work on a branch to begin with?