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: Sun, 05 Apr 2015 16:02:56 +0300 Message-ID: <83oan2n2wv.fsf@gnu.org> 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> <552130A3.5060001@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428239002 8379 80.91.229.3 (5 Apr 2015 13:03:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 13:03:22 +0000 (UTC) Cc: lele@metapensiero.it, stephen@xemacs.org, rms@gnu.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 15:03:14 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 1YekCn-0007eB-0N for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:03:13 +0200 Original-Received: from localhost ([::1]:36426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekCm-0008Kl-7C for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 09:03:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekCi-0008KQ-9T for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:03:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YekCd-0005HL-IT for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:03:08 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:34937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekCd-0005HA-Ag; Sun, 05 Apr 2015 09:03:03 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NMC00M003KEDO00@mtaout27.012.net.il>; Sun, 05 Apr 2015 15:57:45 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC00GPE409TM60@mtaout27.012.net.il>; Sun, 05 Apr 2015 15:57:45 +0300 (IDT) In-reply-to: <552130A3.5060001@math.ntnu.no> 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.183 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:184924 Archived-At: > Date: Sun, 05 Apr 2015 14:54:59 +0200 > From: Harald Hanche-Olsen > CC: rms@gnu.org, lele@metapensiero.it, stephen@xemacs.org, > emacs-devel@gnu.org > > > 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 > less. Don't push unless the output looks sane. Meanwhile is looks like at least some of those changes were already pushed, as I see them on master. So I'm no longer sure what is the current status of Richard's local repository.