From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: Re: cogito push problem Date: Mon, 26 Sep 2005 00:02:23 +0200 Message-ID: <20050925220222.GA21013@pasky.or.cz> References: <20050925192214.GC19023@schottelius.org> <20050925210908.GA21019@pasky.or.cz> <20050925215259.GE19023@schottelius.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 26 00:03:58 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EJeZp-0005A0-NZ for gcvg-git@gmane.org; Mon, 26 Sep 2005 00:02:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932312AbVIYWC1 (ORCPT ); Sun, 25 Sep 2005 18:02:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932313AbVIYWC1 (ORCPT ); Sun, 25 Sep 2005 18:02:27 -0400 Received: from w241.dkm.cz ([62.24.88.241]:22432 "EHLO machine.or.cz") by vger.kernel.org with ESMTP id S932312AbVIYWC0 (ORCPT ); Sun, 25 Sep 2005 18:02:26 -0400 Received: (qmail 2955 invoked by uid 2001); 26 Sep 2005 00:02:24 +0200 To: Nico -telmich- Schottelius Content-Disposition: inline In-Reply-To: <20050925215259.GE19023@schottelius.org> X-message-flag: Outlook : A program to spread viri, but it can do mail too. User-Agent: Mutt/1.5.10i Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Dear diary, on Sun, Sep 25, 2005 at 11:52:59PM CEST, I got a letter where Nico -telmich- Schottelius told me that... > Petr Baudis [Sun, Sep 25, 2005 at 11:09:08PM +0200]: > > Dear diary, on Sun, Sep 25, 2005 at 09:22:14PM CEST, I got a letter > > where Nico -telmich- Schottelius told me that... > > > Hello! > > > > > > I was trying to push my current work out and recieved this error: > > > > > > [21:20] hydrogenium:cinit% cg-push main > > > error: remote ref 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'. > > > > > > My questions: > > > - What does that mean to me as an end-user? > > > - What's the reason that this happened? > > > - How do I fix that? > > > > This means someone probably pushed out some new stuff you don't have > > yet (or you did something evil, like uncommitted something you already > > pushed out before). So what to do is cg-update, that will merge the new > > stuff, then try to cg-push again. > > Thanks for your help, cg-update && cg-commit worked fine, because > cg-update overwrote the changes made by me (I checked cg-diff before, > so that was my intention, not cg-update's fault). But it definitively shouldn't do that anyway. Was that 0.15.1? -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.