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 11:42:45 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1435074586 5286 80.91.229.3 (23 Jun 2015 15:49:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Jun 2015 15:49:46 +0000 (UTC) Cc: 20878@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 23 17:49:40 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 1Z7QS5-00031k-GE for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 17:49:33 +0200 Original-Received: from localhost ([::1]:45971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7QS5-0003fC-2w for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Jun 2015 11:49:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7QLn-0001CP-9S for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:43:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7QLm-0002Ek-IF for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:43:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:54041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7QLm-0002EY-0X for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z7QLl-0001X4-Q3 for bug-gnu-emacs@gnu.org; Tue, 23 Jun 2015 11:43:01 -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 15:43:01 +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.14350741785881 (code B ref 20878); Tue, 23 Jun 2015 15:43:01 +0000 Original-Received: (at 20878) by debbugs.gnu.org; 23 Jun 2015 15:42:58 +0000 Original-Received: from localhost ([127.0.0.1]:55487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7QLi-0001Wn-39 for submit@debbugs.gnu.org; Tue, 23 Jun 2015 11:42:58 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47546) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7QLg-0001WZ-7t for 20878@debbugs.gnu.org; Tue, 23 Jun 2015 11:42:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7QLX-00029P-AZ for 20878@debbugs.gnu.org; Tue, 23 Jun 2015 11:42:51 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7QLV-00028i-Vy; Tue, 23 Jun 2015 11:42:46 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z7QLV-0007H6-H5; Tue, 23 Jun 2015 11:42:45 -0400 X-Spook: Al-Qaeda Clinton MS-13 BART RSA Geraldton Execution Burn X-Ran: 5JP7Yq(OZ4i)d&}(^6`6,R'Db,7=ogJJ%I`?;oNz6z'jv"<]%=dbhDVED`J'+9,:_b8YiO X-Hue: green X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Tue, 23 Jun 2015 09:37:43 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:104269 Archived-At: Stefan Monnier wrote: >> 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". Works for me. (I was thinking first/second, but yours sounds better.)