From: Petr Baudis Date: Sun, 25 Sep 2005 21:09:08 GMT Subject: Re: cogito push problem Message-ID: <20050925210908.GA21019@pasky.or.cz> In-Reply-To: <20050925192214.GC19023@schottelius.org> 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. cg-push already spits out a somewhat more helpful message about this in some cases, I'll make it do so in all cases. Thanks. -- 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.