On 11.08.2015 07:14, Phil Davis wrote: > Greetings > I want to just confirm what is the development/build process for the > 2.0 beta and onwards to release. I can see 3 branches of GitHub: > > 1) 2.0.0-beta1 - this will stay as-is. When beta2 comes here will be a > branch 2.0.0-beta2 and so on... > 2) 2.0 - fixes are actively committed to this branch. When beta2 comes > it will be based off this branch. > 3) master - every now and then all the fixes committed to 2.0 will be > merged up to master. > > Is the above correct? > > "Nightly" builds are coming at > http://download.owncloud.com/desktop/daily/ > > Are these builds now being done from 2.0 branch? > > i.e. do they contain the latest commits that are being applied > hour-by-hour to 2.0 branch?
Yes, that's correct. Using release-branches is new for 2.0, to cater for the async development model of git (i.e. devs can push work committed to for 2.0 to the branch without being hindered too much). master is dead at this point, and will only be merged occasionally. Daniel _______________________________________________ Devel mailing list [email protected] http://mailman.owncloud.org/mailman/listinfo/devel
