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 21:11:49 +0300 Message-ID: <5533EFE5.2050101@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> 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 1429467151 28385 80.91.229.3 (19 Apr 2015 18:12:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 18:12:31 +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 20:12:17 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 1YjthX-0000oe-No for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 20:12:15 +0200 Original-Received: from localhost ([::1]:49292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjthW-0006kk-Nf for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 14:12:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjthP-0006kZ-6V for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:12:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjthK-0005RC-4v for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:12:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjthK-0005R8-1b for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:12:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YjthJ-00036i-N5 for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:12:01 -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 18:12: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.142946712011932 (code B ref 20292); Sun, 19 Apr 2015 18:12:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 19 Apr 2015 18:12:00 +0000 Original-Received: from localhost ([127.0.0.1]:60886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjthH-00036O-Mn for submit@debbugs.gnu.org; Sun, 19 Apr 2015 14:11:59 -0400 Original-Received: from mail-wg0-f44.google.com ([74.125.82.44]:33646) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjthF-00036A-Cv for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 14:11:57 -0400 Original-Received: by wgin8 with SMTP id n8so157600195wgi.0 for <20292@debbugs.gnu.org>; Sun, 19 Apr 2015 11:11:51 -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=RdB7Mz2L2w0Ju7VvLv+sv2swcuzr3HwWE758VSXb2XA=; b=gybKWZ57OQCPxSy+QIuXd80U2Beqax4T3QIBPVYig+s0Nhacw4efQ8DJgVd4tF0FfK l8Gr9FYL+6Uw/d1wvUVRaC9/gar2ulkq5ur5Nl/fE0hh3RspElR1kipDZT/XxFO6ZcpF fZWB/BKZ88jV2dO3kPtpnNCpIhwXxX402xJ7cbhfTa8FF5k6kca7FMs64q+M9WLRa/2a fHyz6glCw7NHgXVF6rQzQG+jIblQ0ew5mdW9LZ0Z0ni9aL1eZkuIB7Gtv6duTtIpRrjz TlzT297QdAPeQLpxtzHNM5l8mvzBDR/R1A2OvBn5/7zn10rI0DF4z06Uvo2k5uZ1wT+T BvYA== X-Received: by 10.194.187.41 with SMTP id fp9mr24348382wjc.58.1429467111799; Sun, 19 Apr 2015 11:11:51 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id q4sm4168080wja.24.2015.04.19.11.11.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Apr 2015 11:11:51 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <83r3rg56zy.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:101734 Archived-At: On 04/19/2015 09:05 PM, Eli Zaretskii wrote: > I was talking about the following simple scenatio: > > git pull > # get an error about uncommitted changes that prevent merge > git stash save > git pull > git stash pop > # get an error message about conflicts > # resolve conflicts and save de-conflicted files And I, about a related but slightly different one, which we'd prefer not to make worse, right? # edit foo.bar git stash save # edit foo.bar again, differently, maybe in several places git add foo.bar git stash pop # get an error message about conflict in foo.bar # resolve conflicts and save foo.bar