From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: This Is The Git Help Mailing List Date: Thu, 13 Nov 2014 10:20:43 -0600 Message-ID: <87d28r5axw.fsf@ktab.red-bean.com> References: Reply-To: Karl Fogel NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415895754 29221 80.91.229.3 (13 Nov 2014 16:22:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:22:34 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:22:29 2014 Return-path: Envelope-to: ged-emacs-devel@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 1XoxAC-0000QT-OJ for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:22:28 +0100 Original-Received: from localhost ([::1]:60843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoxAC-0000gl-05 for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:22:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xox9O-0000ad-JS for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:22:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xox8X-0004SP-ET for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:21:38 -0500 Original-Received: from mail-ig0-x22b.google.com ([2607:f8b0:4001:c05::22b]:40889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xox8X-0004S5-8F for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:20:45 -0500 Original-Received: by mail-ig0-f171.google.com with SMTP id hl2so5312964igb.16 for ; Thu, 13 Nov 2014 08:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:references:reply-to:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=f/yH+qbLB7HVu+EYNa3zBeAoD4zXKgUQ/M9G0lb/rr0=; b=WQb7PtF04CWIPKy+LFGIt0hyLs/LtWPQmB/xPt122ris6ff/5XN5WZoYX9jPzCeNW4 R2zvPymp8XbdOtpMFhYvi++7dF0//Z7aP86fJjlC2JARhDA2WvIXjZwngz9eflNb6wtG 0WUqbKTHVnu8myrhTdcWrPd58C6HWidxsPoFbtpuKKMj/+GxDuZRUVvHB8YxaFWfqU0U nrdtTrIG/2n3cwkxfMZI37Z1b/5P9bGwr9tkU8D8ObuHdinlNy/jbqPQBCGgqkbE6uad wbkvKHvXkOK5JN7Y0BEk6j2VL1z/aOVw8yNwrJoy599o7jrerTG4/FE+GfWnHWO5dClK kSLg== X-Received: by 10.42.206.144 with SMTP id fu16mr2858963icb.79.1415895644701; Thu, 13 Nov 2014 08:20:44 -0800 (PST) Original-Received: from ktab.red-bean.com (74-92-190-113-Illinois.hfc.comcastbusiness.net. [74.92.190.113]) by mx.google.com with ESMTPSA id u65sm13037975ioe.14.2014.11.13.08.20.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Nov 2014 08:20:44 -0800 (PST) In-Reply-To: (Lars Magne Ingebrigtsen's message of "Thu, 13 Nov 2014 17:06:57 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:176944 Archived-At: Lars Magne Ingebrigtsen writes: >So, I had some locally checked-in changes that I wanted to push. So I >said "git push". > >[larsi@stories ~/src/emacs]$ git push >Warning: No xauth data; using fake authentication data for X11 forwarding. >X11 forwarding request failed on channel 0 >To larsi@git.sv.gnu.org:/srv/git/emacs.git > ! [rejected] master -> master (non-fast-forward) >error: failed to push some refs to 'larsi@git.sv.gnu.org:/srv/git/emacs.git' >hint: Updates were rejected because the tip of your current branch is behind >hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') >hint: before pushing again. >hint: See the 'Note about fast-forwards' in 'git push --help' for details. > >Ok, so I tried what I always do in the Gnus repo when this happens, >which usually fixes everything. > >[larsi@stories ~/src/emacs]$ git pull --rebase >Cannot pull with rebase: You have unstaged changes. >Please commit or stash them. > >Err... > >Ok, how about just "git pull" like it says? > >[larsi@stories ~/src/emacs]$ git pull >Warning: No xauth data; using fake authentication data for X11 forwarding. >X11 forwarding request failed on channel 0 >remote: Counting objects: 29, done. >remote: Compressing objects: 100% (13/13), done. >remote: Total 13 (delta 10), reused 0 (delta 0) >Unpacking objects: 100% (13/13), done. >>>From git.sv.gnu.org:/srv/git/emacs > 38fa4bc..d856e6b master -> origin/master > e18c2a5..3d08bc4 emacs-24 -> origin/emacs-24 >error: Your local changes to the following files would be overwritten by merge: > lisp/ChangeLog >Please, commit your changes or stash them before you can merge. >Aborting > >Errr... > >What is the magic sequence of magic git commands that I should use now? What does 'git status' say? You're positive you have no uncommitted/unstaged local changes? It looks from the above like lisp/ChangeLog has local mods... (cue our usual ISO-standard discussion of about why we version change data in files instead of solely in commit logs, of course, but that is another matter). Best, -K