Question: How to use branching to maintain my application

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

Answer

Use Maintenance branches to support previously released builds.

The following is an example of what your branch structure might look like after you have moved a release to the Maintenance folder:
  • Main – Integration branch
    • Source
    • Other asset folders
  • Releases – Container for Release branches
    • Release 1 – Maintenance branch
      • Source

Keep the following recommendations in mind when working with a Maintenance branch:
  • When to branch: After you have released, support the release with a branch in the Maintenance folder.
  • When not to branch: If you will never need to maintain the release, you can use a label to mark the old released build and continue work in the Main branch.
  • Permissions on branch:
    • Read/write for developers working on hotfixes.
    • Read-only for everyone else.
  • Build frequency on branch: On-demand builds.
  • Testing focus on branch: Sign off on release.

You should use Maintenance branches to support an older version of your application. You might choose to merge these changes into your main Integration branch, or leave the changes specific to the Maintenance branch.

Additional Resources


Last edited Jul 18, 2007 at 11:09 PM by jtaylorsi, version 5

Comments

No comments yet.