Quantcast
Channel: Version Control Guide (ex-Branching & Merging)
Viewing all articles
Browse latest Browse all 283

New Post: Lots of "Done" development branches. How to clean up the clutter?

$
0
0

Thank you for the quick reply!

I have ultimately decided to delete the branches. Here is how I got there. See what you think.

My goal:

  • Remove the "clutter" of multiple development branches in a safe manner
  • Keep version history

I found more information and did some of my own testing on our test TFS instance and found these three possibilities:

  • Cloaking the branch
    • Pros - Hides the unneeded branches and keeps history
    • Cons - Specific to a workspace. Every developer would have to do this themselves.
  • Move branch to an "archive" folder
    • Pros - Clears up the clutter for everyone
    • Cons
      • Not easily reversed (just in case)
      • Creates a complicated changeset (a line for each file and folder)
      • Comes with its own trickiness if you ever have to merge to it (best discussion here Renaming branches in TFS 2010)
  • Delete the branch
    • Pros
      • very easy
      • easily reversed
      • creates a simple changeset (one line in it)
    • Cons
      • The word "Delete" is scary
      • Any others?

What do you think?

If I find out more I'll try to post. Here are some more links discussing the topic, but not a lot of extra information there:

What's the best way to deal with dead branches in TFS?

What about "closing" a dev branch - response from Bill! ;-)

Orphaned Branches in TFS


Viewing all articles
Browse latest Browse all 283

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>