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: Mon, 20 Apr 2015 21:06:01 -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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429578447 17470 80.91.229.3 (21 Apr 2015 01:07:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 21 Apr 2015 01:07:27 +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 Tue Apr 21 03:07:16 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 1YkMef-0000Hf-Qr for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 Apr 2015 03:07:13 +0200 Original-Received: from localhost ([::1]:55814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkMef-0001pQ-1M for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 21:07:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkMeb-0001pI-3R for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 21:07:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkMeX-0004Js-2o for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 21:07:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkMeW-0004Jo-W0 for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 21:07:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YkMeT-0000W0-Lr for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 21:07: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: Tue, 21 Apr 2015 01:07: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.14295783691905 (code B ref 20292); Tue, 21 Apr 2015 01:07:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 21 Apr 2015 01:06:09 +0000 Original-Received: from localhost ([127.0.0.1]:34040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkMdd-0000Uf-Ht for submit@debbugs.gnu.org; Mon, 20 Apr 2015 21:06:09 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:46403) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkMdb-0000UQ-KI for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 21:06:08 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVRMCqjW/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLNAcLFBgNJC6HZaIRjGQJAQIBAoM+Aw4ECoNUBKNjhFg X-IPAS-Result: AgUFAGvvdVRMCqjW/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLNAcLFBgNJC6HZaIRjGQJAQIBAoM+Aw4ECoNUBKNjhFg X-IronPort-AV: E=Sophos;i="5.11,557,1422939600"; d="scan'208";a="116937056" Original-Received: from 76-10-168-214.dsl.teksavvy.com (HELO ceviche.home) ([76.10.168.214]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 20 Apr 2015 21:06:01 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id ABFD86610A; Mon, 20 Apr 2015 21:06:01 -0400 (EDT) In-Reply-To: <838udm61ur.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 20 Apr 2015 22:23:08 +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:101797 Archived-At: > Then my vote is for using "git add FILE" with conflicts during a > merge, and "git reset HEAD FILE" with conflicts during "stash pop". > I think this is the simplest solution and is easy to implement with > minimal changes. Fine by me, Stefan