From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Wed, 22 Apr 2015 15:59:46 -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> <83a8y04j6b.fsf@gnu.org> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1429732825 12331 80.91.229.3 (22 Apr 2015 20:00:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 22 Apr 2015 20:00:25 +0000 (UTC) Cc: 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 Wed Apr 22 22:00:13 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 1Yl0oe-00028b-V6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 22:00:13 +0200 Original-Received: from localhost ([::1]:36874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl0oe-0000JD-Hv for geb-bug-gnu-emacs@m.gmane.org; Wed, 22 Apr 2015 16:00:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl0oX-0000F8-IW for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 16:00:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl0oW-0007jc-GT for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 16:00:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl0oW-0007iy-ED for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 16:00:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yl0oV-00022b-Im for bug-gnu-emacs@gnu.org; Wed, 22 Apr 2015 16:00:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Richard Stallman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Apr 2015 20:00: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.14297327907803 (code B ref 20292); Wed, 22 Apr 2015 20:00:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 22 Apr 2015 19:59:50 +0000 Original-Received: from localhost ([127.0.0.1]:36804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yl0oH-00021m-Tc for submit@debbugs.gnu.org; Wed, 22 Apr 2015 15:59:50 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:42347 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yl0oF-00021d-Kz for 20292@debbugs.gnu.org; Wed, 22 Apr 2015 15:59:47 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Yl0oE-0003UL-K6; Wed, 22 Apr 2015 15:59:46 -0400 In-reply-to: <83a8y04j6b.fsf@gnu.org> (message from Eli Zaretskii on Wed, 22 Apr 2015 12:16:28 +0300) 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:101886 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] It seems good. > 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? -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.