[Owncloud] OC3 branch?
Robin Appelman
icewind at owncloud.com
Tue Jan 31 15:48:27 UTC 2012
On Tuesday 31 January 2012 16:29:18 Thomas Olsen wrote:
> On Tuesday 31 January 2012 11:26 Robin Appelman wrote:
> > On Tuesday 31 January 2012 00:23:42 Thomas Tanghus wrote:
> > > Congrats everyone on a hectic day - I enjoyed watching you keeping
> > > owncloud.org afloat :-)
> > >
> > > I saw that icewind tagged v3.0. I'm still trying to grasp how git works,
> > > but is it possible to also make an ownCloud 3 branch? I have some fixes
> > > that really should be in a dot release, and it would be easier imho to
> > > maintain a branch for that, and feel free to break master the next three
> > > months ;-)
> >
> > The current workflow for dot releases is to cherry-pick changes from
> > master
> > into the stable branch.
>
> OK - that would work too I guess. So it is possible to pick a specific
> commit and merge into stable?
Yes, using git cherry-pick somesha1hash
- Robin Appelman
More information about the Owncloud
mailing list