From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Tue, 24 Mar 2015 11:54:52 -0400 Message-ID: References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427212511 2782 80.91.229.3 (24 Mar 2015 15:55:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Mar 2015 15:55:11 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 24 16:55:01 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 1YaRAS-00022z-Ps for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 16:55:00 +0100 Original-Received: from localhost ([::1]:33139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaRAR-0004kP-So for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 11:54:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaRAM-0004kA-RU for emacs-devel@gnu.org; Tue, 24 Mar 2015 11:54:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaRAL-0000ru-Tm for emacs-devel@gnu.org; Tue, 24 Mar 2015 11:54:54 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaRAL-0000rf-R2 for emacs-devel@gnu.org; Tue, 24 Mar 2015 11:54:53 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YaRAK-0000nD-7Q; Tue, 24 Mar 2015 11:54:52 -0400 In-reply-to: <550FE343.8010607@math.ntnu.no> (message from Harald Hanche-Olsen on Mon, 23 Mar 2015 10:56:19 +0100) 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: 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:184154 Archived-At: [[[ 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. ]]] > It will abort the merge if it can't be done using fast-forward. > (In other words, if the local branch has diverged from the remote.) I understand that. What should I do when that occurs? Can someone tell me a full recipe for how to repair lisp/ChangeLog (perhaps, merge it by hand) and how to get the new version into the real repository? -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.