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: Wed, 13 May 2015 09:04:16 -0400 Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1431522337 716 80.91.229.3 (13 May 2015 13:05:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 May 2015 13:05:37 +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 Wed May 13 15:05:26 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 1YsWLj-00088o-Du for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 15:05:23 +0200 Original-Received: from localhost ([::1]:48880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsWLi-00034B-OI for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 09:05:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsWLY-00032x-EX for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 09:05:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsWLP-0003C9-Ag for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 09:05:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsWLP-0003C0-7o for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 09:05:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsWLO-0005ga-Ra for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 09:05:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 May 2015 13:05: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.143152226721808 (code B ref 20292); Wed, 13 May 2015 13:05:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 13 May 2015 13:04:27 +0000 Original-Received: from localhost ([127.0.0.1]:43221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsWKo-0005ff-Dc for submit@debbugs.gnu.org; Wed, 13 May 2015 09:04:26 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:4372) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsWKl-0005fR-8w for 20292@debbugs.gnu.org; Wed, 13 May 2015 09:04:24 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgYFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLDiYHCxQYDSQuh2WiEYxkCQECAQKDPgMOBAqDVASjY4RY X-IPAS-Result: AgYFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLDiYHCxQYDSQuh2WiEYxkCQECAQKDPgMOBAqDVASjY4RY X-IronPort-AV: E=Sophos;i="5.11,557,1422939600"; d="scan'208";a="119541894" Original-Received: from 69-165-139-108.dsl.teksavvy.com (HELO ceviche.home) ([69.165.139.108]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 May 2015 09:04:16 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 60BC766132; Wed, 13 May 2015 09:04:16 -0400 (EDT) In-Reply-To: <55528906.7060606@yandex.ru> (Dmitry Gutov's message of "Wed, 13 May 2015 02:13:10 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) 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:102736 Archived-At: > 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. Yes, I think it's the right solution. Stefan