[haiku-development] Re: The r1alpha4 branch
- From: Ryan Leavengood <leavengood@xxxxxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Sat, 25 Aug 2012 14:57:47 -0400
On Sat, Aug 25, 2012 at 2:49 PM, Niels Sascha Reedijk
<niels.reedijk@xxxxxxxxx> wrote:
>>
>> 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?)
Yes indeed. I didn't say it, but I plan to primarily cherry-pick
changes into the r1alpha4 branch. For this who don't know, git
cherry-pick is a command which pretty much works as you might expect
based on its name:
http://git-scm.com/docs/git-cherry-pick
http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick
--
Regards,
Ryan
Other related posts:
