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 14:54:59 +0200 Message-ID: <552130A3.5060001@math.ntnu.no> References: <83twx2xoc8.fsf@gnu.org> <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> <551FA7F6.8060103@math.ntnu.no> <87wq1rfvvp.fsf@uwakimon.sk.tsukuba.ac.jp> <87619bbmgj.fsf@nautilus.nautilus> <87r3rzfpvh.fsf@uwakimon.sk.tsukuba.ac.jp> <83vbhan3rb.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 1428238554 1874 80.91.229.3 (5 Apr 2015 12:55:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 12:55:54 +0000 (UTC) Cc: lele@metapensiero.it, stephen@xemacs.org, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 14:55:46 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 1Yek5Z-0002Gb-2a for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:55:45 +0200 Original-Received: from localhost ([::1]:36303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek5Y-00052w-Gf for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 08:55:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek51-00051J-QG for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:55:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yek50-0003CN-PH for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:55:11 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:46004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek4v-00031p-O6; Sun, 05 Apr 2015 08:55:05 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id BE33E669F28; Sun, 5 Apr 2015 14:55:02 +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 519F166316A; Sun, 5 Apr 2015 14:55:01 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83vbhan3rb.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.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:184918 Archived-At: Eli Zaretskii wrote: >> Date: Sun, 05 Apr 2015 05:10:59 -0400 >> From: Richard Stallman >> Cc: lele@metapensiero.it, emacs-devel@gnu.org Note: I had not seen this mail from Richard when I responded to his=20 other one. It does change things a bit. > It looks like you've stashed all the changes upstream that the failed > pull brought in, but failed to merge due to your local changes (in > lisp/ChangeLog) that conflicted with the changes upstream. > >> Now I am concerned that when I pull again, it will reinstall all of th= is. > > I suggest to unstash them, fix the conflict in lisp/ChangeLog, and > then commit all of that. Then you should be in sync with upstream and > can pull again. Yes. At risk of repeating myself: After committing, run git diff origin/master which should give you exactly the changes you have written, no more, no=20 less. Don't push unless the output looks sane. =E2=80=93 Harald