From: Petr Baudis Date: Sun, 25 Sep 2005 22:02:23 GMT Subject: Re: cogito push problem Message-ID: <20050925220222.GA21013@pasky.or.cz> In-Reply-To: <20050925215259.GE19023@schottelius.org> 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.