Announcement

Collapse
No announcement yet.

Is it best practice to merge to trunk from the branch directly or from the tag?

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • Is it best practice to merge to trunk from the branch directly or from the tag?

    Hi All,

    We currently use ClearCase but are planning to migrate to Subversion. I have a process question around merging code back to trunk in Subversion.

    At every successful build from the development branch we are planning to create a corresponding release tag. Once we have a successful package (signed off for production) we plan to lock the development branch and the release tag from which the package was generated.

    Should we then perform the merge to trunk from the development branch or the tag? or does it not matter?

    Thanks,
    Mistry

  • #2
    It won't matter as they'll both be the same versions of the same files - though with that in mind, you don't really need to keep the development branch locked as the tag points to the same files at the same revisions, so you could safely remove that once you've created the tag to save space if you wish.

    Hope that helps.

    Comment

    Working...
    X