From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#20878: smerge yours/other are backwards for git stash conflicts Date: Tue, 23 Jun 2015 03:10:36 -0400 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1435043486 7540 80.91.229.3 (23 Jun 2015 07:11:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Jun 2015 07:11:26 +0000 (UTC) To: 20878@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 23 09:11:10 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 1Z7IMP-0002sU-Ay for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 09:11:09 +0200 Original-Received: from localhost ([::1]:43676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7IMO-0007zo-Gc for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 03:11:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7IMK-0007zi-Tx for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 03:11:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7IMK-0001em-17 for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 03:11:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7IMJ-0001eg-UB for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 03:11:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z7IMJ-0004j9-Bk for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 03:11:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Jun 2015 07:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20878 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.143504344718146 (code B ref -1); Tue, 23 Jun 2015 07:11:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Jun 2015 07:10:47 +0000 Original-Received: from localhost ([127.0.0.1]:54856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7IM2-0004ic-PR for submit@debbugs.gnu.org; Tue, 23 Jun 2015 03:10:47 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:32986) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7IM1-0004iP-4V for submit@debbugs.gnu.org; Tue, 23 Jun 2015 03:10:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7ILu-0001bY-Ee for submit@debbugs.gnu.org; Tue, 23 Jun 2015 03:10:39 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:59750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7ILu-0001bU-Ab for submit@debbugs.gnu.org; Tue, 23 Jun 2015 03:10:38 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z7ILs-0008En-Js; Tue, 23 Jun 2015 03:10:36 -0400 X-Spook: Noriega NORAD Attorney General Brush fire Serbian MP5K-SD X-Ran: q*VQmdo*$[R/s@i+jb7%hzvDIQ_njS^-qjVPUqSs+nXt^3'mKH[:lwK)}NXXF.!fyko5o$ X-Hue: blue X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:104252 Archived-At: Package: emacs Version: 24.5 Severity: minor If you do git stash git pull git stash pop then if you end up with a conflict, it looks like this: <<<<<<< Updated upstream ## Don't create ns_appbindir via an order-only prerequisite, because ======= ## Don't create ns_appbindir via an order-only prequisite, because >>>>>>> Stashed changes If you then do 'smerge-keep-yours' it takes the "upstream" version. If you do 'smerge-keep-other', it takes the "stash" version. This seems backwards to me. The stash is my version, the upstream is the other version. (I guess it's because Git's conflicts seem to be presented the opposite way round to those of CVS, svn, bzr, ... Because consistency is obviously for losers.)