On Tuesday 31 January 2012 16:48 Robin Appelman wrote: > 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
I've just committed https://gitorious.org/owncloud/owncloud/commit/3f1486534f687fdcad219b97072ed71a2998de87 and https://gitorious.org/owncloud/owncloud/commit/6c340416d9020f40031119d1d76bf797066895ec that adds error checking and fixes bug oc-8, oc-27 and oc-93. All things I would have done before v3 but suddenly ran out of time ;-) Hopefully the last change in that version of the contacts UI... -- Med venlig hilsen / Best Regards Thomas Tanghus _______________________________________________ Owncloud mailing list [email protected] https://mail.kde.org/mailman/listinfo/owncloud
