[Kde-pim] Re: how to push to kdepim?

[Guy Maurel]

Hello!

On Tuesday, March 15, 2011 08:47:20 PM Torgny Nyblom wrote:
> On Tuesday 15 March 2011 18.57.16 Guy Maurel wrote:
> > Hello!
> > 
> > As proposed by Jos, I should "ship it" my solution to bug 264355.
> > But I encounter a problem, I cannot deal with:
> > I make:
> > $ git push -v origin master
> > Pushing to ssh://git@git.kde.org/kdepim
> > To ssh://git@git.kde.org/kdepim
> > 
> >  ! [rejected]        master -> master (non-fast-forward)
> > 
> > error: failed to push some refs to 'ssh://git@git.kde.org/kdepim'
> > 
> > even a git pull, does not help.
> > What do I do wrong?
> > Thanks for any help.
> 
> If you (in the repo dir) launch "gitk --all". Is the origin/master a direct
> descendant of your master? if not you have  done something wrong along the
> way and the branch graph might help you figure out what.
my git-database might have been corrupt.
I made a new clone... and the git push is OK.

Thanks.
-- 
guy
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/