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:30:30 +0300 Message-ID: <5533F446.4020400@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> 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 1429468283 13332 80.91.229.3 (19 Apr 2015 18:31:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 18:31:23 +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:31: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 1Yjtzq-0003R5-4Q for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 20:31:10 +0200 Original-Received: from localhost ([::1]:49322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjtzp-00015t-3B for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 14:31:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjtzl-00015o-Tl for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:31:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yjtzi-0002OR-O7 for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:31:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yjtzi-0002ON-LS for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yjtzi-0003ZR-Ft for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:31: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 18:31: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.142946824313699 (code B ref 20292); Sun, 19 Apr 2015 18:31:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 19 Apr 2015 18:30:43 +0000 Original-Received: from localhost ([127.0.0.1]:60897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjtzO-0003Ys-Py for submit@debbugs.gnu.org; Sun, 19 Apr 2015 14:30:43 -0400 Original-Received: from mail-wg0-f54.google.com ([74.125.82.54]:33049) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YjtzL-0003Yd-8w for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 14:30:39 -0400 Original-Received: by wgin8 with SMTP id n8so157851385wgi.0 for <20292@debbugs.gnu.org>; Sun, 19 Apr 2015 11:30:33 -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=VNDqF8OxOOQo1WyMGzEUJgViJj5YuXK64xaEbgsHuBU=; b=Ase+kvuCy00EJSFoKKas48Ss0MqnTDP5mqrrnadwd3kS5KkHkCMELfbbjDuxHwYI0l wk6mI3YHDPaOee48jDckATTCb8XP46Or9rOqMGt7leL5okqhskF91E9noLVJlpNvc3sU xiXJhsjUcKsr8HTJeVaIpWKQ+ochnixwNi+k1vzs1Ze3fj+F3bPrvh7XybioZpM3+6E3 6Mab3PZ3dlFDpMfn479TGAvQng0zazXMS5mCRPE7xKh2m+ZEfz9H/aFbowCu//5s4Jb7 V3YlKBICeXU/EvL9wQ2skhLdvaBU7A1UdGLuV7nYYan3bEm0FiD2nlIs9UgOJX1UBdG7 Xp8Q== X-Received: by 10.180.73.230 with SMTP id o6mr19124393wiv.11.1429468233720; Sun, 19 Apr 2015 11:30:33 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id e10sm11968886wij.11.2015.04.19.11.30.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Apr 2015 11:30:33 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <83oamk561p.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:101736 Archived-At: On 04/19/2015 09:25 PM, Eli Zaretskii wrote: > If we can, yes. If not, this is way out of scope of the bug report. Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63?