Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • Keep feature branches short-lived. This will prevent conflicts when merging back to the trunk.
  • Use tags (when registering your changes) to mark releases or milestones. This will make it easy to create a new branch, e.g. for creating a hotfix branch or to be able to view an old revision without the need to keep old branches.
  • Choose a branching strategy and stick to it across repository's and teams. Evaluate and adjust if necessary.
  • Keep the amount of active branches small to prevent conflicts and to remain overview. 
  • Don't keep a lot of old branches; rather tag your trunk consequently to be able to create a branch when necessary.

...