views:

24

answers:

1

I have this problem where I'm merging changes up into my integration branch but when I need to work on development I forget to switch back to the development branch. Are there any solutions out there available to help prevent me from editing the to Integration branch except while I'm merging in new code?

In other words, I'd like either some kind of visual cue that tells me I'm in the Integration branch, or some way to prevent myself from checking out files from the Integration branch for editing.

... or maybe I just need some Ritalin.

+1  A: 

Merge Only Checkin Policy does exactly that.

Like all checkin policies, it's only as secure as the client; you can't force someone to install it. In TFS 2010, merging is its own permission so you can control it from the server side as well.

Richard Berg
wow, that's awesome, many thanks!
Dave