Branching strategy for parallel development that won’t be in the same release

How much (and what kind of) structure you need depends a lot on what you want to be able to do. Figure out what you can't live without, what you want to have, and what you don't care about.

A good example set of decisions might be:

Things we can't live without:

• be able to reconstruct any past release at any time
• be able to maintain multiple supported major versions of the product at any time

Things we would like to have:

• be able to perform ongoing major-feature development (for the next major release) without worrying about branch merges
• be able to perform maintenance updates to past releases

Things we can live without:

• automated backporting of changes from current work to past releases
• never interrupt major feature development even for a few days or a week at at time

If the above were your goals, you could then adopt a process like this:

1. Do all development work on the trunk of your VCS ("master" in git)
2. When you are close to a major release, halt major feature development, and focus on system stability for a week or so
3. When the trunk seems stable, create a branch for this major release
4. Major feature development can now proceed on the trunk, while only bug fixes and release preparation are allowed on the branch
5. However, all bug fixes to be made to the branch must first be tested on the trunk; this ensures that they will also be present in all future releases
6. Create a (VCS) tag on the branch when you are ready to release; this tag can be used to recreate the release at any time, even after further work on the same branch
7. Further maintenance releases to this major release (minor releases) can now be prepared on the branch; each will be tagged before release
8. In the mean time, major feature development geared toward the next major release can continue on the trunk
9. When you get close to that release, repeat the above steps, creating a new releases branch for that release. This allows you to have multiple major releases, each on their own branch, in supported status at the same time, with the ability to release separate minor releases against each.

This process won't answer all of your questions -- in particular, you will need a process in place to decide what fixes can be made to a release branch, and to ensure that bugs are not fixed on a release branch first (such fixes should always be tested on the trunk where possible). But it will give you a framework in which to make such decisions.

It sounds like you're talking about using Xcode to build a Software Product Line kind of a configuration. I've done something like this before with respect to white-labelling a product - so there were no code changes between products, just different resources.

My approach would be to define a different target for each product - whether they're in the same project or not is up to you. Xcode handles dependencies across different projects quite well, so you could easily define multiple projects that state their dependencies, and use xcconfig files[*] to maintain configuration details that must be the same across all targets. It's easiest to do that from a version control perspective, to reduce the chance that people working on different products will need to edit the same project file.

Put the code that goes into all products into its own (static library) target, and include that target as a dependency of the other targets. Similarly if there are resources that are shared across all projects, create a "bundle" target that includes those shared resources.

[*] An xcconfig file is a plain text file containing Xcode build settings. If more than one of your projects contains targets that should use the same build settings, you can base those targets all on the same .xcconfig file so the settings are defined in the same place.