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: Sun, 30 Nov 2014 01:25:10 +0100 Message-ID: References: <766B1E70-9E88-4E18-8B00-2946AC46428B@swipnet.se> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1417307146 12137 80.91.229.3 (30 Nov 2014 00:25:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 30 Nov 2014 00:25:46 +0000 (UTC) Cc: "emacs-devel@gnu.org Development" To: Rostislav Svoboda Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 30 01:25:40 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 1XusKa-00020Z-KF for ged-emacs-devel@m.gmane.org; Sun, 30 Nov 2014 01:25:40 +0100 Original-Received: from localhost ([::1]:49238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XusKa-0008Cl-6U for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 19:25:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XusKC-0008CW-Ch for emacs-devel@gnu.org; Sat, 29 Nov 2014 19:25:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XusK6-0005qL-T8 for emacs-devel@gnu.org; Sat, 29 Nov 2014 19:25:16 -0500 Original-Received: from mailfe03.swip.net ([212.247.154.65]:54929 helo=swip.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XusK6-0005pv-Ma for emacs-devel@gnu.org; Sat, 29 Nov 2014 19:25:10 -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 mailfe03.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 386148922; Sun, 30 Nov 2014 01:25:09 +0100 X-Mailer: iPad Mail (12B435) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.247.154.65 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:178494 Archived-At: Thanks for the pointer.=20 Jan D.=20 > 29 nov 2014 kl. 16:36 skrev Rostislav Svoboda : >=20 > http://stackoverflow.com/a/7348934 >=20 >> On 29 November 2014 at 10:38, Jan D. wrote: >> Hi. >>=20 >> Another pull apparently fixed it. >>=20 >> Jan D. >>=20 >>> 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 dbff8fd118824163f4d2780fa856= 6cf92e1d8e86 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 6b765b8facbdbb03f280280078= 85236601652515 but expected d9ad26a6df4110d32454496d2d864fb9a15d6d00 >>> ! d9ad26a..6b765b8 emacs-24 -> origin/emacs-24 (unable to update loc= al ref) >>>=20 >>> Thanks, >>>=20 >>> Jan D. >>=20 >>=20