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: Wed, 13 May 2015 19:20:39 +0300 Message-ID: <83y4ksjvoo.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431534085 16886 80.91.229.3 (13 May 2015 16:21:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 May 2015 16:21:25 +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 Wed May 13 18:21: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 1YsZPE-0007Ap-Su for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 18:21:13 +0200 Original-Received: from localhost ([::1]:50069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZPE-0005JZ-8J for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 12:21:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZP9-0005JL-JK for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:21:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZP4-0006s7-Un for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:21:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZP4-0006s3-R2 for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:21:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsZP4-0004Wf-GJ for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:21: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: Wed, 13 May 2015 16:21: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.143153405517358 (code B ref 20292); Wed, 13 May 2015 16:21:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 13 May 2015 16:20:55 +0000 Original-Received: from localhost ([127.0.0.1]:43977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsZOv-0004Vr-Vl for submit@debbugs.gnu.org; Wed, 13 May 2015 12:20:54 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:39557) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsZOt-0004VK-3K for 20292@debbugs.gnu.org; Wed, 13 May 2015 12:20:51 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NOA00L00QD71E00@mtaout25.012.net.il> for 20292@debbugs.gnu.org; Wed, 13 May 2015 19:16:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOA00KOYQJJDJ10@mtaout25.012.net.il>; Wed, 13 May 2015 19:16:31 +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:102747 Archived-At: > From: Stefan Monnier > Cc: Eli Zaretskii , esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Wed, 13 May 2015 09:04:16 -0400 > > > What shall we do? Unstage the automatically-staged files? Revert the changes > > from this bug? It seems Git really wants the changes staged after the > > conflict resolution. > > IOW, the "resolve" step should always just use "git add", like we used > to do. How is that TRT when the original state was that there were uncommitted and unstaged changes? Running "git add" would confuse people who are not very knowledgeable about the index. If they _are_ knowledgeable, they'll "git reset" right away anyway. So please don't go back.