From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Jan D." Newsgroups: gmane.emacs.devel Subject: Re: Git error on master? Date: Sat, 29 Nov 2014 10:38:20 +0100 Message-ID: <766B1E70-9E88-4E18-8B00-2946AC46428B@swipnet.se> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1417253938 10764 80.91.229.3 (29 Nov 2014 09:38:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2014 09:38:58 +0000 (UTC) To: "emacs-devel@gnu.org Development" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 29 10:38:51 2014 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 1XueUJ-00030D-En for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 10:38:47 +0100 Original-Received: from localhost ([::1]:47115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XueUI-0007eb-Ty for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 04:38:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XueU1-0007eV-Nn for emacs-devel@gnu.org; Sat, 29 Nov 2014 04:38:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XueTv-00032J-Pr for emacs-devel@gnu.org; Sat, 29 Nov 2014 04:38:29 -0500 Original-Received: from mailfe06.swip.net ([212.247.154.161]:38215 helo=swip.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XueTv-00031l-K3 for emacs-devel@gnu.org; Sat, 29 Nov 2014 04:38:23 -0500 X-T2-Spam-Status: No, hits=0.8 required=5.0 tests=BAYES_50 Original-Received: from hosdjarv.se (account mj138573@tele2.se [46.59.42.57] verified) by mailfe06.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 550088614 for emacs-devel@gnu.org; Sat, 29 Nov 2014 10:38:21 +0100 In-Reply-To: X-Mailer: Apple Mail (2.1993) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.247.154.161 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:178449 Archived-At: Hi. Another pull apparently fixed it. Jan D. > 29 nov 2014 kl. 10:28 skrev Jan D. : >=20 > Hello. >=20 > Does anyone know how to resolve this? What happened? >=20 > error: Ref refs/remotes/origin/master is at = dbff8fd118824163f4d2780fa8566cf92e1d8e86 but expected = f054f0f265a09adde84c9f543d0a2f810cdafe8e > =46rom git.sv.gnu.org:/srv/git/emacs > ! f054f0f..dbff8fd master -> origin/master (unable to update = local ref) > * [new branch] dynamic-modules -> origin/dynamic-modules > error: Ref refs/remotes/origin/emacs-24 is at = 6b765b8facbdbb03f28028007885236601652515 but expected = d9ad26a6df4110d32454496d2d864fb9a15d6d00 > ! d9ad26a..6b765b8 emacs-24 -> origin/emacs-24 (unable to update = local ref) >=20 > Thanks, >=20 > Jan D. >=20