[Sugar-devel] [Fwd: Re: gitorious problems]

[Bernie Innocenti]

Maybe useful info for other Gitorious users too...

-------- Forwarded Message --------
From: Felipe López Toledo <zer.subzero at gmail.com>
To: Bernie Innocenti <bernie at sugarlabs.org>
Subject: Re: gitorious problems
Date: Thu, 9 Jul 2009 03:37:35 -0500

Thanks Bernie, it works :)

>I'm the admin, but this is a git question :-)
I'll be more careful in the future

2009/7/7 Bernie Innocenti <bernie at sugarlabs.org>:
> On 07/07/09 15:53, Felipe López Toledo wrote:
>> Hi man.
>>
>> sorry for disturb you,
>>
>> I'm getting this error when I'm trying to synchronize with gitorious:
>>
>>     error: denying non-fast forward refs/heads/master
>>
>>     - [deleted] i18n-experimental
>>     ! [remote rejected] master -> master (non-fast forward)
>>     error: failed to push some refs to
>>     'gitorious at git.sugarlabs.org:karma/mainline.git'
>>
>>
>> I have been looking a solution, but I haven't been able to fix it.
>
> Looks like someone else pushed a few commits to gitorious since the last
> time.  This is normal and expected in parallel development, and you can
> verify if it is the case by looking at the changelog from the Gitorious
> web interface.
>
> "git push" can only do simple (fast-forward) merges, and is unable to
> push on topo of other people changes.  All you need to do is perform a
> "git pull" first.  This will fetch the commits from the repository and
> merge them on your local git respository.
>
> Git will complain if this merge causes any conflict, and ask you to
> resolve them.  Follow the instructions, and when you're done resolving
> all conflicts you should be able to push to the repository.
>
> After you learn this workflow, working with git daily will be quite easy
> for you.
>
>
>> I think you're the admin and maybe you could know the reason, my
>> apologizes if I'm wrong.
>
> I'm the admin, but this is a git question :-)
>
> --
>   // Bernie Innocenti - http://codewiz.org/
>  \X/  Sugar Labs       - http://sugarlabs.org/
>



-- 
   // Bernie Innocenti - http://codewiz.org/
 \X/  Sugar Labs       - http://sugarlabs.org/