From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 20:46:32 +0100 Message-ID: <87y4rc9rhj.fsf@igel.home> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416080824 11548 80.91.229.3 (15 Nov 2014 19:47:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 19:47:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 20:46:57 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 1XpjJA-000421-Mx for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 20:46:56 +0100 Original-Received: from localhost ([::1]:41791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjJA-0003WW-Cv for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 14:46:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjJ2-0003WR-Ko for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:46:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpjIw-0004dZ-KJ for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:46:48 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:46088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpjIw-0004cw-Dj for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:46:42 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jg6W21DFCz3hjC1; Sat, 15 Nov 2014 20:46:37 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jg6W11jBBzvh1y; Sat, 15 Nov 2014 20:46:37 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id tfbyM5UNG8uZ; Sat, 15 Nov 2014 20:46:33 +0100 (CET) X-Auth-Info: 0z8An5vkao2PbzRnwdjwpocXdriSL9q6QlmrINPe2IfHrbDSwK1TcD7ZS1lBpwUz Original-Received: from igel.home (ppp-93-104-152-230.dynamic.mnet-online.de [93.104.152.230]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 15 Nov 2014 20:46:32 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id AE6882C31CC; Sat, 15 Nov 2014 20:46:32 +0100 (CET) X-Yow: With this weapon I can expose fictional characters and bring about sweeping reforms!! In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sat, 15 Nov 2014 20:08:31 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:177237 Archived-At: Lars Magne Ingebrigtsen writes: > Lars Magne Ingebrigtsen writes: > >> ./trunk/admin/git-new-workdir trunk emacs-24 > > I had problems pushing to trunk now after doing a "git pull" on the main > branch. The error message was, as usual, pretty obscure. And it was? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."