[rekonq] Correct method to resync my clone with mainline?

[lindsay.mathieson at gmail.com]

>
> --- Original message ---
> Subject: Re: [rekonq] Correct method to resync my clone with mainline?
> From: Nikhil Marathe <nsm.nikhil at gmail.com>
> To: <lindsay.mathieson at gmail.com>
> Cc: <rekonq at kde.org>
> Date: Monday, 17/05/2010  2:54 PM
>
> On Mon, May 17, 2010 at 7:37 AM,  <lindsay.mathieson at gmail.com> wrote:
>>
>> Given my clones changes have been merged with mainline - what's the
>> correct way to bring my clone in sync with the other merges on
>> mainline? Is there a way to do it via the gitorious web interface?
>>
>> What I have done is:
>>
>> git pull git://gitorious.org/rekonq/mainline.git master
>> git push git at gitorious.org:~blackpaw/rekonq/blackpaws-rekonq.git
>
> Well since rekonq uses merge requests, what I suggest is to never
> really make changes to master.
>
> Always pull master with:
>        git pull --rebase origin(which is http://.../mainline.git) 
> master
>
> Then
>        git checkout -b bug-fix
>
> Hack hack hack
>
>        git push myclone ( myclone is git at gito.../blackpaws-rekonq.git 
> ) bug-fix
>
> Then create a merge request.
>
> When the merge request is Merged
>
>        git checkout master
>        rebase again
>
> If you have a long running feature branch, always rebase master, then
> *merge* ( not rebase ) master into the feature branch.
>

Thanks Nikhil, much appreciated - it took me a bit of man reading but 
what you layout makes a lot of sense. I'll print this one and stick it 
beside my monitor.




--
Lindsay Mathieson
http://blackpaw.jalbum.net/home/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/rekonq/attachments/20100517/1af98d9b/attachment.htm