Boost logo

Boost :

Subject: Re: [boost] Boost contributing tutorial (GitHub)
From: Sohail Somani (sohail_at_[hidden])
Date: 2014-05-21 11:00:35


On 21/05/2014 10:39 AM, Adam Wulkiewicz wrote:
>
> (the above is the short version of pull which should work if the develop
> tracked the origin/develop which should be the default case)
> and then just merge it in your branch
>
> git checkout feature/example
> git merge develop
>
> or cherry-pick single commits or whatever.
>
> Or you could just merge the origin/develop directly with 'git pull',
> which is a shorthand for 'fetch' followed by 'merge'
> (http://git-scm.com/docs/git-pull).
> It's more Git-related than Boost-related and probably more depends on
> what do you prefer.
> I wanted to keep the tutorial simple.

In that case, the step-by-step format you've created is perfect.

Sohail


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk