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 15:20:28 -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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429557684 7990 80.91.229.3 (20 Apr 2015 19:21:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 19:21:24 +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 Mon Apr 20 21:21: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 1YkHFm-0000PL-Ny for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 21:21:10 +0200 Original-Received: from localhost ([::1]:55091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHFm-0007sA-1z for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 15:21:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHFh-0007r0-RH for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:21:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkHFe-0006gC-GA for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:21:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkHFe-0006g7-D5 for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:21:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YkHFe-00069q-3M for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 15:21: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: Mon, 20 Apr 2015 19: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.142955765523646 (code B ref 20292); Mon, 20 Apr 2015 19:21:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 20 Apr 2015 19:20:55 +0000 Original-Received: from localhost ([127.0.0.1]:33852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkHFW-00069J-QV for submit@debbugs.gnu.org; Mon, 20 Apr 2015 15:20:55 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:35794) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkHFU-00069A-GT for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 15:20:52 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 5565E85FA8; Mon, 20 Apr 2015 15:20:52 -0400 (EDT) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 2D14C1E5B94; Mon, 20 Apr 2015 15:20:28 -0400 (EDT) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id 12B42B40DC; Mon, 20 Apr 2015 15:20:28 -0400 (EDT) In-Reply-To: <83fv7u6epr.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 20 Apr 2015 17:45:20 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca 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:101773 Archived-At: >> I get the impression that with this change vc-find-conflicted-files >> won't work correctly any more, because the files will keep appearing >> as "conflicted", even after I've resolved all the conflicts in them. > You need to "unconflict" them by hand, yes, with "git reset HEAD FILE". I very much want Emacs to do that for me (or "git add", I really couldn't care less which is used, I just want the "conflicted" marker to be cleared). I went to the trouble to get this working for Bzr back in the day, then Svn (and managed to find someone else to do it for Git), because I find it much too inconvenient otherwise. > If it is safe to issue this command automatically, we could do > that in the case of "stash pop" conflict _instead_ of doing "git add" > in the "normal" merge-conflict case. I don't really know what is "safe" in this respect. For my own use, all of the options we've considered are safe. Stefan