From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Emacs VC issue Date: Mon, 17 Dec 2018 18:03:51 +0200 Message-ID: <83k1k8dtso.fsf@gnu.org> References: <87ftuwwphv.fsf@aol.com> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1545062517 3035 195.159.176.226 (17 Dec 2018 16:01:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 17 Dec 2018 16:01:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Live System User Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 17 17:01:53 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gYvL7-0000dq-CL for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2018 17:01:53 +0100 Original-Received: from localhost ([::1]:47581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYvND-0007ah-Tg for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2018 11:04:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYvN0-0007W0-Eh for emacs-devel@gnu.org; Mon, 17 Dec 2018 11:03:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYvMv-00036U-Ej for emacs-devel@gnu.org; Mon, 17 Dec 2018 11:03:50 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYvMv-00036O-BA; Mon, 17 Dec 2018 11:03:45 -0500 Original-Received: from [176.228.60.248] (port=4350 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gYvMu-0006RI-UK; Mon, 17 Dec 2018 11:03:45 -0500 In-reply-to: <87ftuwwphv.fsf@aol.com> (message from Live System User on Mon, 17 Dec 2018 03:01:48 -0500) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:231880 Archived-At: > From: Live System User > Date: Mon, 17 Dec 2018 03:01:48 -0500 > > I am currently experiencing an issue with the Emacs > master repo and "vc-update". > > When I go to "pull", I get the following error: > > > Running "git pull --stat"... > >From git://git.sv.gnu.org/emacs > 3edddba..61dbe6b master -> origin/master > error: Your local changes to the following files would be overwritten by merge: > src/macuvs.h > Please, commit your changes or stash them before you can merge. > Aborting > Updating 8c28ac8..61dbe6b > > > > Since I did not make any "local changes" (I only do > pull and "make"), I suspect that something happened > on the remote's end. Nothing happened. But in any such case, when you see a message like that and know for sure you didn't change the offending file, the remedy is simple: git checkout src/macuvs.h git pull