From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Sun, 22 Mar 2015 15:53:27 +0100 Message-ID: <87twxdnkwo.fsf@igel.home> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427036048 27845 80.91.229.3 (22 Mar 2015 14:54:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Mar 2015 14:54:08 +0000 (UTC) Cc: emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 22 15:53:59 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 1YZhGG-0007ps-0K for ged-emacs-devel@m.gmane.org; Sun, 22 Mar 2015 15:53:56 +0100 Original-Received: from localhost ([::1]:51313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZhGA-0003Hv-DU for ged-emacs-devel@m.gmane.org; Sun, 22 Mar 2015 10:53:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZhFy-0003Gw-0O for emacs-devel@gnu.org; Sun, 22 Mar 2015 10:53:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZhFt-0004lb-53 for emacs-devel@gnu.org; Sun, 22 Mar 2015 10:53:37 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:49623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZhFs-0004kv-VY; Sun, 22 Mar 2015 10:53:33 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3l92094qKzz3hhYR; Sun, 22 Mar 2015 15:53:28 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3l92085G1Lzvh2B; Sun, 22 Mar 2015 15:53:28 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id XOmdKyTcdHlO; Sun, 22 Mar 2015 15:53:28 +0100 (CET) X-Auth-Info: F7Bk5qyMLwz1qQ5hQAfAFOwszxDCoWRKxO4JAmq0qiKT0XWfMWj1ca/jV7ULWeyL Original-Received: from igel.home (host-188-174-200-118.customer.m-online.net [188.174.200.118]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 22 Mar 2015 15:53:27 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 9136E2C35FC; Sun, 22 Mar 2015 15:53:27 +0100 (CET) X-Yow: I'm having BEAUTIFUL THOUGHTS about the INSIPID WIVES of smug and wealthy CORPORATE LAWYERS.. In-Reply-To: (Richard Stallman's message of "Sun, 22 Mar 2015 10:17:08 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.10 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:184119 Archived-At: Richard Stallman writes: > I edited lisp/ChangeLog and tried to commit it with C-x v v. > That gave me the error message > > fatal: cannot do a partial commit during a merge. > > I am now stuck. I don't know what a "merge" is; it is certainly > nothing I asked to do. > > How can I get this unwedged? Try 'git merge --abort'. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."