From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Fri, 03 Apr 2015 11:30:43 +0300 Message-ID: <83r3s1pqa4.fsf@gnu.org> 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> <87mw2phbj5.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428049865 28134 80.91.229.3 (3 Apr 2015 08:31:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 08:31:05 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 10:30:58 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 1Ydx0D-00016w-IJ for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 10:30:57 +0200 Original-Received: from localhost ([::1]:33007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydx0C-0003N1-Ok for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 04:30:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydx09-0003Lt-Li for emacs-devel@gnu.org; Fri, 03 Apr 2015 04:30:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydx06-00010q-FI for emacs-devel@gnu.org; Fri, 03 Apr 2015 04:30:53 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:34575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydx06-00010Q-1l for emacs-devel@gnu.org; Fri, 03 Apr 2015 04:30:50 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NM800900280J000@mtaout28.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:29:30 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM8009K92961V00@mtaout28.012.net.il>; Fri, 03 Apr 2015 11:29:30 +0300 (IDT) In-reply-to: <87mw2phbj5.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 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:184819 Archived-At: > From: "Stephen J. Turnbull" > Cc: Steinar Bang , > emacs-devel@gnu.org > Date: Fri, 03 Apr 2015 17:16:30 +0900 > > > 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. If that's true (and I'm not sure it is), then the procedure after resolving conflicts is simply git pull git push