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 15:44:40 +0300 Message-ID: <83vbhan3rb.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428237903 24864 80.91.229.3 (5 Apr 2015 12:45:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 12:45:03 +0000 (UTC) Cc: lele@metapensiero.it, stephen@xemacs.org, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 14:44:56 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 1Yejv4-00039P-P2 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:44:54 +0200 Original-Received: from localhost ([::1]:36279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejv4-00034Z-4S for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 08:44:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejus-00034R-U7 for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:44:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yejup-0008S3-Oi for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:44:42 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:49715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejup-0008Rw-Gm; Sun, 05 Apr 2015 08:44:39 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NMC00B0032BQ300@a-mtaout21.012.net.il>; Sun, 05 Apr 2015 15:44:38 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC00B5B3EDOZ40@a-mtaout21.012.net.il>; Sun, 05 Apr 2015 15:44:38 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:184917 Archived-At: > Date: Sun, 05 Apr 2015 05:10:59 -0400 > From: Richard Stallman > Cc: lele@metapensiero.it, emacs-devel@gnu.org > > I tried to verify this by investigating what changes I stashed last > week. But I could not tell the answer, because 'git stash show' gave > me the output below. 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 this. 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.