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: Thu, 14 May 2015 20:30:26 +0300 Message-ID: <5554DBB2.3070005@yandex.ru> References: <83fv88ta5r.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> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.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 1431624683 19349 80.91.229.3 (14 May 2015 17:31:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 17:31:23 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Stefan Monnier , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 14 19:31:12 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 1YswyW-0003la-AJ for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 19:31:12 +0200 Original-Received: from localhost ([::1]:56028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YswyV-0002R4-M7 for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 13:31:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YswyT-0002Qy-4J for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 13:31:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YswyO-0005bY-52 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 13:31:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YswyO-0005bU-1a for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 13:31:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YswyN-0006zY-9y for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 13:31:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2015 17:31:03 +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.143162463926842 (code B ref 20292); Thu, 14 May 2015 17:31:03 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 17:30:39 +0000 Original-Received: from localhost ([127.0.0.1]:45315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yswxy-0006yr-Fx for submit@debbugs.gnu.org; Thu, 14 May 2015 13:30:39 -0400 Original-Received: from mail-wg0-f51.google.com ([74.125.82.51]:33876) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yswxu-0006yY-NE for 20292@debbugs.gnu.org; Thu, 14 May 2015 13:30:35 -0400 Original-Received: by wguv19 with SMTP id v19so20832462wgu.1 for <20292@debbugs.gnu.org>; Thu, 14 May 2015 10:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=dxzdvlzAiYOttNrPs2o/s6Tqfv7HYFf4hYu7hclg1L0=; b=aYn9GAZZnvDHzApIrNCEtHhTc3UwnvlOBgXL8zBExfej40cvjU0xoAfS9OgKg/41TY 9rALjCib2LuF7OkcFDDTncMZ6HYgZAWIvfbdfOYz8Xe4SBMUP2O+5eDmRY6o1wj+ATw1 hJmZAiPHp4dvpxJ1Al1X4G/Vw70j7T7Peoq8FktWak8yb8uZ06A1YzxTLwJmdbqr/rZu XP4+tX1whpGk9oMG3eCRLweWa0LS0TAUKGz9bgpGUCjNCskkheGgZRZcWgUQQL+Zp+So revIhuOgIeAEXn6+LvULGTPH78k+k7NC2Od1HrWLduR3vHtnCFqUqDTIndTRiIRK4sXW aDBw== X-Received: by 10.194.109.229 with SMTP id hv5mr10484470wjb.119.1431624628845; Thu, 14 May 2015 10:30:28 -0700 (PDT) Original-Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id gt10sm10722826wib.20.2015.05.14.10.30.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 10:30:28 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: 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:102797 Archived-At: On 05/14/2015 06:51 PM, Stefan Monnier wrote: >> May I ask why you have uncommitted changes when you pull (or do >> whatever else requires to stash them)? My main use case: there are local changes in several configuration files, which I don't ever intend to commit. > Typical case: > - before committing, I do a final "pull". > - the "pull" fails, so I have to stash/pull/unstash > - the commit touches several files and has a conflict somewhere. To avoid this scenario, I usually commit, and then 'git pull --rebase', which we don't, and shouldn't, recommend. >> Why don't you commit them or move them to a branch, or work on >> a branch to begin with? I think it would be annoying to create a branch for every tiny change.