Re: cogito push problem

From: Nico -telmich- Schottelius <nico-linux-git@schottelius.org>
Date: Sep 25, 2005, 21:52 UTC
Message-ID: <20050925215259.GE19023@schottelius.org>
In-Reply-To: <20050925210908.GA21019@pasky.or.cz>

Petr Baudis [Sun, Sep 25, 2005 at 11:09:08PM +0200]:

Show 18 quoted lines

> Dear diary, on Sun, Sep 25, 2005 at 09:22:14PM CEST, I got a letter
> where Nico -telmich- Schottelius <nico-linux-git@schottelius.org> 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).

Nico

-- 
Latest project: cconfig (http://nico.schotteli.us/papers/linux/cconfig/)
Open Source nutures open minds and free, creative developers.