From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Sun, 19 Apr 2015 22:27:58 +0300 Message-ID: <553401BE.90501@yandex.ru> 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> <83mw2455gq.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1429471762 789 80.91.229.3 (19 Apr 2015 19:29:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 19:29:22 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 19 21:29: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 1Yjuty-0003wN-2e for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 21:29:10 +0200 Original-Received: from localhost ([::1]:49410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjutx-0000kV-EV for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 15:29:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjutt-0000kQ-UL for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 15:29:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yjutq-0003AH-Eo for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 15:29:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjutq-0003AD-Bn for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 15:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yjutq-0004so-5J for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 15:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Apr 2015 19:29: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.142947168918708 (code B ref 20292); Sun, 19 Apr 2015 19:29:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 19 Apr 2015 19:28:09 +0000 Original-Received: from localhost ([127.0.0.1]:60919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjusz-0004rg-0R for submit@debbugs.gnu.org; Sun, 19 Apr 2015 15:28:09 -0400 Original-Received: from mail-wi0-f174.google.com ([209.85.212.174]:32858) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjusw-0004rB-QC for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 15:28:07 -0400 Original-Received: by wiax7 with SMTP id x7so68521468wia.0 for <20292@debbugs.gnu.org>; Sun, 19 Apr 2015 12:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=4WgVaBgI3muRXwK6ZLmkdS2U/dmQCQUw9QP3WSJams4=; b=QkS6Gs6OkDOL8y+nr6t+T71Kgkkq4FtYqh83Yf4HR+50WFR89Z/3sNIxAWkoXm1mJW P2iRDTE/ScV0xkBJGH5Ktd+vQ0Zrv5XGQ//8ovgp2NqVjQxwIEIii711hO8W79WrF8Dq 2S/5AGGwtfRWCA3ArhpddBiEUNvCgxJHd7ADAdSTROvSAZWtMihgTcJpYFlvqPWbgOmt WUdwoXxRYSUH0rHHHaRPyO0hJ6VfmxokZq4/ggvHM5l//PiJ6ZYh2KyRGU4DtkkkFld+ 2ZODU9Kl97/MQAtUNAE+wXCTeEfQyGGO7l9gC5uCU8ltSODWtTOjhUx334Ay+EQqHC1i rpog== X-Received: by 10.180.88.99 with SMTP id bf3mr9319296wib.75.1429471681075; Sun, 19 Apr 2015 12:28:01 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id ei4sm63437wib.22.2015.04.19.12.27.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Apr 2015 12:28:00 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <83mw2455gq.fsf@gnu.org> 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:101738 Archived-At: On 04/19/2015 09:38 PM, Eli Zaretskii wrote: > IMO, it's too radical: there's no need to avoid turning on > smerge-mode, as it is useful for conflict resolution. "git add" is > not run by smerge-mode, it is run by vc-git-resolve-when-done, so it > should be enough to avoid adding that to after-save-hook, I think. Right. That should be resolved now.