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: git is screwed Date: Sun, 22 Mar 2015 10:17:08 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427033851 27404 80.91.229.3 (22 Mar 2015 14:17:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Mar 2015 14:17:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 22 15:17:23 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 1YZggt-00078Z-CU for ged-emacs-devel@m.gmane.org; Sun, 22 Mar 2015 15:17:23 +0100 Original-Received: from localhost ([::1]:51206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZggs-0001Rh-M5 for ged-emacs-devel@m.gmane.org; Sun, 22 Mar 2015 10:17:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZggg-0001RG-7t for emacs-devel@gnu.org; Sun, 22 Mar 2015 10:17:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZggf-0000ss-CW for emacs-devel@gnu.org; Sun, 22 Mar 2015 10:17:10 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZggf-0000sc-AG for emacs-devel@gnu.org; Sun, 22 Mar 2015 10:17:09 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YZgge-0008FR-Qh; Sun, 22 Mar 2015 10:17:08 -0400 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:184117 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. ]]] I committed some changes using C-x v v in vc-dir. Something went wrong with lisp/ChangeLog. It appears that my change log entries went into an old version of that file; I don't know why this happened, since I wrote them today after doing 'git pull'. After this, I did 'git pull' again, and it said there was a merge conflict in lisp/ChangeLpg. A lot of text appears to be missing from the file. It said, "fix conflicts and then commit the result." 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? Is my change to the default value of browse-url-firefox-program visible in browse-url.el? It should try icecat first. My previous use of git is limited to getting the Emacs sources to build them. -- 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.