Using the edit - merge - commit workflow in TFS Source Control

Question

Ive been using sourcegear vault and subversion/visual svn for quite a while now and am a big fan of the CVS disconnected style "Edit -> Merge -> Commit" way of using source control.

Since we moved to TFS 2010 i have been reintroduced to the horrid "checkout -> edit -> checkin" sourcesafe style way of working. Meaning only one user can work on a file at any time.

I cant find anything that suggests this can be changed.

Is it possible?

Answer 1

Checkouts in TFS aren't generally exclusive. By default, multiple users can checkout a single file. Exceptions are binary file types like JPGs, PNGs, etc. which are checked out exclusively by default.

Once you're ready to commit your changes, you can use the Pending Changes tool window to check for conflicts and merge if necessary.