Skip to content

Different branches

Mike Schreiber edited this page Mar 9, 2023 · 5 revisions

There are several branches maintain in this repo. Here is a quick overview how it is organized.

main

  • combination develop and release branch.
  • All devmain shipping bits come from main, with tags being added using 0.y.z numbering.
  • Every changelist merged here should be ready to ship at any time, so it's not the place to do ongoing feature work.

main_0.1, main_0.2, main_0.x ...

  • Special branches for releasing to customers on older versions of iOS.
  • No active development is done in these branches; these are purely bug and security fixes.
  • In particular, main_0.1 supports back to iOS 11, and main_0.2 supports back to iOS 13.

fluent2-tokens

  • Actively working branch from the fluent maintainers to build Fluent 2 design controls.
  • New controls, as well as newly-converted SwiftUI controls, are built here and then individually cherry-picked to main for release.
Clone this wiki locally