From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Rostislav Svoboda Newsgroups: gmane.emacs.devel Subject: Re: Git error on master? Date: Sat, 29 Nov 2014 16:36:00 +0100 Message-ID: References: <766B1E70-9E88-4E18-8B00-2946AC46428B@swipnet.se> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1417275431 28510 80.91.229.3 (29 Nov 2014 15:37:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2014 15:37:11 +0000 (UTC) Cc: "emacs-devel@gnu.org Development" To: "Jan D." Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 29 16:37:00 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 1Xuk4w-0006yg-Go for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 16:36:58 +0100 Original-Received: from localhost ([::1]:47976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xuk4w-0002mn-4Q for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 10:36:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xuk4h-0002mf-K6 for emacs-devel@gnu.org; Sat, 29 Nov 2014 10:36:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xuk4g-0001hY-Ad for emacs-devel@gnu.org; Sat, 29 Nov 2014 10:36:43 -0500 Original-Received: from mail-vc0-x22b.google.com ([2607:f8b0:400c:c03::22b]:55807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xuk4g-0001hJ-5h for emacs-devel@gnu.org; Sat, 29 Nov 2014 10:36:42 -0500 Original-Received: by mail-vc0-f171.google.com with SMTP id hy4so3611913vcb.2 for ; Sat, 29 Nov 2014 07:36:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=2IWnIZ0QpzqEiBn/L2Tn88KXa5ii7M0SJbiNt6d+/zU=; b=b8R4efgcpLXItkIYY47Lc5OxscDp7KaambgCAxFFVfc1bHdxxa3bxPjaPpzUOGpDjI wapBitv3PEYvhXQILj5Gux7Qr+wjTqPZ6EFG4vkdKiYrZTcGTwV/ASAlgAbn7olXvrj2 8He++BGqvcmm1fUt7Mo/bG7Y7juwxwWGN9mtnJrPDtTOBqrhaMCvKbnKB7nCy2G+5ZYs Q20/q5oHHI9b0ix5IPjwPLKIR6WwCWAc6xGA5dKN1z3aICayP/s6mSLwNxX1potOYQOz UxraUlA1C7IVtmCYqcYkNtAVk+DwrCTA9vDI63Wcq/caDOA8W4Iu9gALaUGML9SjjmvT vvfA== X-Received: by 10.52.166.102 with SMTP id zf6mr5635929vdb.25.1417275401240; Sat, 29 Nov 2014 07:36:41 -0800 (PST) Original-Received: by 10.31.54.11 with HTTP; Sat, 29 Nov 2014 07:36:00 -0800 (PST) In-Reply-To: <766B1E70-9E88-4E18-8B00-2946AC46428B@swipnet.se> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400c:c03::22b 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:178456 Archived-At: http://stackoverflow.com/a/7348934 On 29 November 2014 at 10:38, Jan D. wrote: > Hi. > > Another pull apparently fixed it. > > Jan D. > >> 29 nov 2014 kl. 10:28 skrev Jan D. : >> >> Hello. >> >> Does anyone know how to resolve this? What happened? >> >> error: Ref refs/remotes/origin/master is at dbff8fd118824163f4d2780fa8566cf92e1d8e86 but expected f054f0f265a09adde84c9f543d0a2f810cdafe8e >> From 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) >> >> Thanks, >> >> Jan D. >> > >