From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Wolfgang Jenkner Newsgroups: gmane.emacs.bugs Subject: bug#20878: smerge yours/other are backwards for git stash conflicts Date: Tue, 23 Jun 2015 17:04:19 +0200 Message-ID: <85h9pya1qw.fsf@iznogoud.viz> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1435073005 10226 80.91.229.3 (23 Jun 2015 15:23:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Jun 2015 15:23:25 +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 17:23:14 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 1Z7Q2b-00031Z-7o for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 17:23:13 +0200 Original-Received: from localhost ([::1]:45788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7Q2a-0003vz-Fg for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 11:23:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7Q2W-0003uS-De for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:23:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7Q2Q-0006UM-Oq for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:23:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:54000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7Q2Q-0006UE-LV for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z7Q2Q-0000yA-DP for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:23:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Wolfgang Jenkner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Jun 2015 15:23: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.14350729463674 (code B ref 20878); Tue, 23 Jun 2015 15:23:02 +0000 Original-Received: (at 20878) by debbugs.gnu.org; 23 Jun 2015 15:22:26 +0000 Original-Received: from localhost ([127.0.0.1]:55446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7Q1p-0000xB-JX for submit@debbugs.gnu.org; Tue, 23 Jun 2015 11:22:25 -0400 Original-Received: from b2bfep13.mx.upcmail.net ([62.179.121.58]:44116) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7Q1m-0000wv-TS for 20878@debbugs.gnu.org; Tue, 23 Jun 2015 11:22:23 -0400 Original-Received: from edge11.upcmail.net ([192.168.13.81]) by b2bfep13.mx.upcmail.net (InterMail vM.8.01.05.11 201-2260-151-128-20120928) with ESMTP id <20150623152216.BQMD20529.b2bfep13-int.chello.at@edge11.upcmail.net> for <20878@debbugs.gnu.org>; Tue, 23 Jun 2015 17:22:16 +0200 Original-Received: from iznogoud.viz ([91.119.210.132]) by edge11.upcmail.net with edge id jrNF1q00o2rwc0T0BrNFld; Tue, 23 Jun 2015 17:22:16 +0200 X-SourceIP: 91.119.210.132 Original-Received: from wolfgang by iznogoud.viz with local (Exim 4.85 (FreeBSD)) (envelope-from ) id 1Z7Q1f-0000Yy-AF; Tue, 23 Jun 2015 17:22:15 +0200 User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.50 (berkeley-unix) 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:104263 Archived-At: On Tue, Jun 23 2015, Glenn Morris wrote: > This seems backwards to me. The stash is my version, the upstream is the > other version. I think that's similar to what happens while rebasing; git-rebase(1) explains this in the description of the -m switch. So, swapping "mine" with "other" would be equally confusing for many people.