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: Thu, 23 Apr 2015 00:32:06 +0300 Message-ID: <83fv7r3l49.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> <83a8y04j6b.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429738402 6920 80.91.229.3 (22 Apr 2015 21:33:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Apr 2015 21:33:22 +0000 (UTC) Cc: 20292@debbugs.gnu.org, dgutov@yandex.ru To: rms@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 22 23:33:11 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 1Yl2Gc-0004nS-Q8 for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 23:33:10 +0200 Original-Received: from localhost ([::1]:37108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl2Gc-000125-4N for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 17:33:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl2GY-00011w-41 for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 17:33:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl2GU-0000hA-Ui for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 17:33:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl2GU-0000h5-S1 for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 17:33:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yl2GU-0004DR-E2 for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 17:33: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, 22 Apr 2015 21:33: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.142973833716149 (code B ref 20292); Wed, 22 Apr 2015 21:33:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 22 Apr 2015 21:32:17 +0000 Original-Received: from localhost ([127.0.0.1]:36839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yl2Fl-0004CP-Fe for submit@debbugs.gnu.org; Wed, 22 Apr 2015 17:32:17 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:52624) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yl2Fi-0004CA-Sk for 20292@debbugs.gnu.org; Wed, 22 Apr 2015 17:32:16 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NN800A008U0J100@a-mtaout20.012.net.il> for 20292@debbugs.gnu.org; Thu, 23 Apr 2015 00:32:07 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN800A4195IKC00@a-mtaout20.012.net.il>; Thu, 23 Apr 2015 00:32:07 +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:101891 Archived-At: > Date: Wed, 22 Apr 2015 15:59:46 -0400 > From: Richard Stallman > CC: dgutov@yandex.ru, 20292@debbugs.gnu.org, dgutov@yandex.ru > > > The one thing to remember is that after saving the file whose > > conflicts were resolved, you should type "C-x v v" to commit it in the > > first case, and do nothing in the second. > > Does VC determine automatically whether the conflict was due to merge > or due to git stash pop, > or do you tell VC by doing C-x v v in the first case and nothing > in the second case? It determines automatically. It has to, because what it does when you save the file already depends on that. When you type "C-x v v" after saving it, it's too late.