From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.help Subject: Re: git: Date: Fri, 27 Feb 2015 19:30:49 -0500 Message-ID: <634mq6yj0m.fsf@fencepost.gnu.org> References: <20150226222407.GA18239@boo.workgroup> <87mw3zgdcj.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1425083464 9693 80.91.229.3 (28 Feb 2015 00:31:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 28 Feb 2015 00:31:04 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Feb 28 01:31:04 2015 Return-path: Envelope-to: geh-help-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 1YRVJA-000308-3J for geh-help-gnu-emacs@m.gmane.org; Sat, 28 Feb 2015 01:31:04 +0100 Original-Received: from localhost ([::1]:39539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVJ9-0001Hl-CJ for geh-help-gnu-emacs@m.gmane.org; Fri, 27 Feb 2015 19:31:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVIx-00018Y-Bo for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:30:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRVIw-00025r-Ml for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:30:51 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVIw-00025R-KW for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:30:50 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YRVIv-0004Q2-O1; Fri, 27 Feb 2015 19:30:49 -0500 X-Spook: AVN basement tempest Semtex Compsec FTS2000 SSL BROMURE X-Ran: k,Sd.(qrKJXsXx%o`k('?8l@I\!K>p`4]VRzj#=p.g|fX^:\s\o8j4^nRxjk9^>JNY_x-T X-Hue: green X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Fri, 27 Feb 2015 19:24:11 -0500") 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-Received-From: 2001:4830:134:3::e X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:102939 Archived-At: Glenn Morris wrote: > It's a shame git is less user-friendly (refusing to pull if you have > uncommitted changs, even if the changes are identical to what you want > to pull) than eg bzr or svn, which just do the sensible thing (pull and > resolve conflicts automatically where possible). PS just to throw yet another thing out there, the generally advertised solution for this problem seems to be: git stash; git pull; git stash pop. Obviously this makes us look cool by playing with "stashes" and is far superior to things Just Working like they used to. Yours grumpily...