From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 12:11:41 +0100 Message-ID: <5513E96D.8070204@math.ntnu.no> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427368354 17304 80.91.229.3 (26 Mar 2015 11:12:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 11:12:34 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 12:12:18 2015 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 1Yb5ho-0008G3-HX for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 12:12:08 +0100 Original-Received: from localhost ([::1]:43856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5hn-0006BI-IQ for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 07:12:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5hZ-0006B4-7E for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:11:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb5hR-0002CO-WA for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:11:49 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:44825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5hR-0002C5-PC; Thu, 26 Mar 2015 07:11:45 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 5B48066A821; Thu, 26 Mar 2015 12:11:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:700:300:1470:789b:1233:a9df:9367] (unknown [IPv6:2001:700:300:1470:789b:1233:a9df:9367]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 0AE9C669F7C; Thu, 26 Mar 2015 12:11:44 +0100 (CET) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:184308 Archived-At: Richard Stallman wrote: > [[[ To any NSA and FBI agents reading my email: please consider ]]] > [[[ whether defending the US Constitution against all enemies, ]]] > [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > > I think it might be useful if you posted the result of running =E2= =80=9Cgit > > status -s=E2=80=9D so we can assess the damage. > > Here it is. I can only guess what the flags mean, You can run =E2=80=9Cgit help status=E2=80=9D and read what it says under= the heading=20 =E2=80=9CShort Format=E2=80=9D. > but if 'M' means it > is modified on this machine, I am very surprised -- I never touched > most of those files. The vast majority have M in the first column and a space in the second.=20 That means they are modified in the index (uh, staging area is the=20 modern name for it). They will be the result of the incomplete merge: Most of them are files that have been modified in the remote repository=20 but not locally. The Ds have been deleted, and the As have been added. > M .gitattributes > M CONTRIBUTE > [=E2=80=A6] The only file with a non-blank second column is here: > MM lisp/ChangeLog That's your merge conflict. I have to go now, no time for the next couple hours. But perhaps someone=20 else will give you advice. Perhaps it is useful if you also run these commands and report the output= : git show-ref HEAD git show-ref master The latter assuming you're on the master branch. Otherwise, replace=20 =E2=80=9Cmaster=E2=80=9D by emacs-24 or whatever branch you're on. =E2=80=93 Harald