[haiku-development] Re: The r1alpha4 branch
- From: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Sat, 25 Aug 2012 20:49:48 +0200
Hi,
On Sat, Aug 25, 2012 at 6:24 PM, Ryan Leavengood <leavengood@xxxxxxxxx> wrote:
> On Sat, Aug 25, 2012 at 12:16 PM, scottmc <scottmc2@xxxxxxxxx> wrote:
>> Ok, now for some git questions (before I go and make a mess of things)...
>>
>> What are the correct steps to take to check out the r1alpha4 branch
>> using git and what are the steps to commit changes.
>
> You have all you need already if you pulled recently. Just do git
> checkout r1alpha4 in your Haiku source. There is no reason to download
> another copy like in the past with Subversion.
>
> Please read this:
>
> http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging
>
>> Are we committing to master or to the branch?
>
> Commit changes which go to both to master, then merge into r1alpha4.
> If the change is only for the alpha, then only commit them to
> r1alpha4, like I did with the version changes.
Shouldn't you cherry-pick though? At some points the branches will
diverge and merging will also pull the previous commits that were not
meant to go into the alpha branch. (Right?)
Regards,
N>
Other related posts:
