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: VC mode and git Date: Sun, 05 Apr 2015 11:59:31 +0200 Message-ID: <55210783.4040800@math.ntnu.no> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> 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 1428227996 15634 80.91.229.3 (5 Apr 2015 09:59:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 09:59:56 +0000 (UTC) Cc: "Stephen J. Turnbull" , sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 11:59:53 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 1YehLM-0003qS-8K for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:59:52 +0200 Original-Received: from localhost ([::1]:35711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehLL-0004fI-OG for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 05:59:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehL8-0004f2-8l for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:59:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YehL6-0001pV-Vm for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:59:38 -0400 Original-Received: from hylle06.itea.ntnu.no ([2001:700:300:3::235]:37363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehL6-0001p5-Gn for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:59:36 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id D3662660EE3; Sun, 5 Apr 2015 11:59:33 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::6c00:a298:a5fc:6f32] (unknown [IPv6:2001:4662:4ffb:0:6c00:a298:a5fc:6f32]) (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 64206660E4C; Sun, 5 Apr 2015 11:59:33 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83619bnjsy.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::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:184911 Archived-At: Eli Zaretskii wrote: > Note the "merge conflict" part and the error message Richard cites: > "fix conflicts and then commit the result." This is a message > displayed by Git when you have a conflict in _committed_ changes, and > the merge fails half-way through. Error messages about conflicts in > uncommitted changes are different Indeed. But then the lack of any files marked U in the output of =E2=80=9C= git=20 status -s=E2=80=9D is puzzling. Instead, there is just lisp/ChangeLog, ma= rked=20 MM. Perhaps that is a side effect of something else he did. =E2=80=93 Harald