Re: [cpp-netlib-devel] github

[Jeroen H. <vex...@gm...>]

Hi Dean,

On Sat, Dec 26, 2009 at 05:56, Dean Michael Berris
<mik...@gm...> wrote:
> Hi Jeroen!
>
> I apologize for taking a while to respond. I've been away from my
> computer for the better part of this Christmas break and I've only
> gotten back to my mail now. Please see my response below.
>
> On Wed, Dec 23, 2009 at 3:12 AM, Jeroen Habraken <vex...@gm...> wrote:
>> Hi,
>>
>> Firstly, thank you Dean for merging my current fork.
>
> You're welcome! Thanks for the contributions also. :)
>
>> This however has
>> gotten me confused with github, can I still use my current fork to
>> continue development (which I suspect will be broken more often, as
>> bigger changes are coming), or is it easier to create a new fork. If a
>> new fork is easier, what branch should I fork ?
>>
>
> Yes, you can continue to use your fork to continue development. What I
> suggest you do is learn how to track a remote branch using git, and
> then continue development on 0.5-devel -- or if you prefer, create a
> branch on your github fork then do your development from there.
> Because you're doing development against the master branch, I'll
> integrate your work to my master branch only when you feel it's safe
> to integrate to master on your end.
>
> So the steps would be:
>
> 1. Create a branch on your fork for your development
> 2. Continue development on your branch
> 3. Once you're ready to integrate more work in, make sure your master
> branch is sync'ed with my master branch
> 4. Merge your work from your branch to your master branch
> 5. Send me a pull request message and I will integrate to my
> fork-integration branch, then integrate to master
>
> I hope this makes sense.
>
> Have a great week ahead and I hope you're having a great and restful
> holiday season!
>
> --
> Dean Michael Berris
> blog.cplusplus-soup.com | twitter.com/mikhailberis
> linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com
>

Just found the Fork Queue and I think I've got the basics of github
figured. I found a bug in the current code on github where I was using
the Spirit > operator instead of >>, which could lead to exceptions
being thrown, and made a pull request for that. Next I'll try to merge
my code with the new parser to the 0.5-devel branch of my fork as I'm
already working in a 0.5-devel checkout

Yours,
Jeroen