From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Fri, 03 Apr 2015 17:16:30 +0900 Message-ID: <87mw2phbj5.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <86r3s1acxv.fsf@dod.no> <83twwxpsbg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428049019 15072 80.91.229.3 (3 Apr 2015 08:16:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 08:16:59 +0000 (UTC) Cc: Steinar Bang , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 10:16:45 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 1YdwmR-0000K8-MK for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 10:16:43 +0200 Original-Received: from localhost ([::1]:32971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwmQ-0007Oe-Iz for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 04:16:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwmO-0007OY-ER for emacs-devel@gnu.org; Fri, 03 Apr 2015 04:16:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdwmL-0003rJ-8a for emacs-devel@gnu.org; Fri, 03 Apr 2015 04:16:40 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:46982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwmH-0003qS-FN; Fri, 03 Apr 2015 04:16:33 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id B0B461C3898; Fri, 3 Apr 2015 17:16:30 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 63AA7120EC9; Fri, 3 Apr 2015 17:16:30 +0900 (JST) In-Reply-To: <83twwxpsbg.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184817 Archived-At: Eli Zaretskii writes: > The situation is that a pull was done and failed because of > conflicting local commits. The merge part of the pull in this case > is already aborted. "Abort" means *nothing is done* as far as I can tell from the documentation and experimentation with a couple of toy repos. In particular, files that were modified on remote are *not* updated locally (although the commits and dependent objects are in the origin branch), and there are *no* conflict markers added to the file that would have conflicts if the merge was conducted. > All Richard needs to do is resolve the conflicts one by one (AFAIU, > he only had one to begin with, in a ChangeLog file), and then do: > > git commit > git push I guess this procedure will create a commit without any of the most recently pulled content. He will need to do the merge again, which may result in more conflicts. (I can't be sure since I can't figure out how he got the repo in that state.)