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: Fri, 15 May 2015 10:14:38 +0300 Message-ID: <83bnhmia75.fsf@gnu.org> References: <83fv88ta5r.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> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@gnu.org> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.fsf@gnu.org> <5554F2F3.6010109@yandex.ru> <83fv6zhs3j.fsf@gnu.org> <55550482.1020404@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431674128 22791 80.91.229.3 (15 May 2015 07:15:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 15 May 2015 07:15:28 +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 Fri May 15 09:15:12 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 1Yt9pv-0006zz-51 for geb-bug-gnu-emacs@m.gmane.org; Fri, 15 May 2015 09:15:11 +0200 Original-Received: from localhost ([::1]:58191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt9pu-000641-Ky for geb-bug-gnu-emacs@m.gmane.org; Fri, 15 May 2015 03:15:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt9pr-00061e-9n for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 03:15:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yt9pn-00020X-W7 for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 03:15:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt9pn-00020D-Tq for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 03:15:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yt9pn-00034M-0B for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 03:15:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 15 May 2015 07:15: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.143167408911764 (code B ref 20292); Fri, 15 May 2015 07:15:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 15 May 2015 07:14:49 +0000 Original-Received: from localhost ([127.0.0.1]:45696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yt9pY-00033f-AU for submit@debbugs.gnu.org; Fri, 15 May 2015 03:14:48 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:55833) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yt9pV-00033O-IA for 20292@debbugs.gnu.org; Fri, 15 May 2015 03:14:46 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NOD00000QKGTN00@mtaout25.012.net.il> for 20292@debbugs.gnu.org; Fri, 15 May 2015 10:10:26 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOD00F9PQLEKIB0@mtaout25.012.net.il>; Fri, 15 May 2015 10:10:26 +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:102821 Archived-At: > From: Stefan Monnier > Cc: Eli Zaretskii , esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Thu, 14 May 2015 16:55:50 -0400 > > > I think the only sane way to handle this is to always use "git add" and > to add a config var so users who don't like it can disable it. Who'd like it? It will do something utterly inappropriate. > After all, when unstashing changes in a file that already has > a modification staged That's not the use case we were discussing, though. We were discussing a use case where the user merged from another repository, and then wants her uncommitted changes restored. Leaving them staged will trip the naive users. > IOW, I think bug#20292 is simply not a bug. I respectfully disagree.