From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Fri, 15 May 2015 21:55:44 +0300 Message-ID: <83mw15hdqn.fsf@gnu.org> References: <83fv88ta5r.fsf@gnu.org> <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> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@gnu.org> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.fsf@gnu.org> <5554F2F3.6010109@yandex.ru> <83fv6zhs3j.fsf@gnu.org> <55550482.1020404@yandex.ru> <83bnhmia75.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431716187 6932 80.91.229.3 (15 May 2015 18:56:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 15 May 2015 18:56:27 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org, dgutov@yandex.ru To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 15 20:56:16 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 1YtKmO-00054f-BG for geb-bug-gnu-emacs@m.gmane.org; Fri, 15 May 2015 20:56:16 +0200 Original-Received: from localhost ([::1]:32772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtKmN-0002dY-Si for geb-bug-gnu-emacs@m.gmane.org; Fri, 15 May 2015 14:56:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtKmJ-0002dM-H3 for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 14:56:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtKmB-0004hO-PY for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 14:56:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtKmB-0004hH-Jp for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 14:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YtKmB-00063b-2I for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 14:56:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 15 May 2015 18:56: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.143171615423266 (code B ref 20292); Fri, 15 May 2015 18:56:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 15 May 2015 18:55:54 +0000 Original-Received: from localhost ([127.0.0.1]:46469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtKm1-00063C-Vy for submit@debbugs.gnu.org; Fri, 15 May 2015 14:55:54 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:53790) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtKlz-00062x-47 for 20292@debbugs.gnu.org; Fri, 15 May 2015 14:55:52 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NOE00I00MOOYM00@mtaout24.012.net.il> for 20292@debbugs.gnu.org; Fri, 15 May 2015 21:47:02 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOE0094OMUDQTA0@mtaout24.012.net.il>; Fri, 15 May 2015 21:47:02 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il 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:102839 Archived-At: > From: Stefan Monnier > Cc: dgutov@yandex.ru, esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Fri, 15 May 2015 14:13:50 -0400 > > > That's not the use case we were discussing, though. We were > > discussing a use case where the user merged from another repository, > > and then wants her uncommitted changes restored. Leaving them staged > > will trip the naive users. > > But Emacs is not the main culprit: Git itself will stage all the > non-conflicting changes, so why should this not trip the user similarly? The users I have in mind expect Emacs to save them from Git idiosyncrasies. > IOW if the user gets tripped by Emacs doing "git add" after resolving > a unstash conflict, why would that same user not already be tripped > identically by Git doing this "git add" on the non-conflicted files? Because they don't use Git from the shell, or at least try not to.