From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20878: smerge yours/other are backwards for git stash conflicts Date: Tue, 23 Jun 2015 09:37:43 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1435066742 30026 80.91.229.3 (23 Jun 2015 13:39:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Jun 2015 13:39:02 +0000 (UTC) Cc: 20878@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 23 15:38:51 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 1Z7OPZ-00067u-1u for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 15:38:49 +0200 Original-Received: from localhost ([::1]:45402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OPY-0000GO-CX for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 09:38:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OOt-0007rA-Ie for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 09:38:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7OOp-0002Rp-JB for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 09:38:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OOp-0002Rk-H1 for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 09:38:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z7OOo-0006v9-Kv for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 09:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Jun 2015 13:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20878 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20878-submit@debbugs.gnu.org id=B20878.143506667226587 (code B ref 20878); Tue, 23 Jun 2015 13:38:02 +0000 Original-Received: (at 20878) by debbugs.gnu.org; 23 Jun 2015 13:37:52 +0000 Original-Received: from localhost ([127.0.0.1]:54994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7OOd-0006uk-98 for submit@debbugs.gnu.org; Tue, 23 Jun 2015 09:37:51 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:33369) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7OOY-0006uX-Ru for 20878@debbugs.gnu.org; Tue, 23 Jun 2015 09:37:47 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t5NDbhLw029884; Tue, 23 Jun 2015 09:37:43 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 0E590660F3; Tue, 23 Jun 2015 09:37:43 -0400 (EDT) In-Reply-To: (Glenn Morris's message of "Tue, 23 Jun 2015 03:10:36 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.2 X-NAI-Spam-Rules: 2 Rules triggered GEN_SPAM_FEATRE=0.2, RV5346=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5346> : inlines <3260> : streams <1460157> : uri <1967063> 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:104259 Archived-At: > If you then do 'smerge-keep-yours' it takes the "upstream" version. > If you do 'smerge-keep-other', it takes the "stash" version. Yup, those names seemed like a good idea at the time, but they don't work well now. We should change the names from "yours/theirs" to something like "upper/lower". Stefan