Typed DataSets offer a great way to implement the interaction with a database. When using typed datasets in conjunction with source control, like Team Foundation Server, then things get a little tricky. TFS offers optimistic check out (a.k.a. side by side checkout), which means that multiple persons can work on a file at once. If a conflict is detected upon checking in, then the user has the option to use a mergetool to resolve the differences. This works great for most source files, but not so good on designer generated files. This problem manifests itseld a lot around typed datasets, where merging the designer generated files can wreak havoc on your sources and 'break' the designer.
Instead I prefer to use exclusive checkout when editing typed datasets.
To set your source control to allow exclusive checkouts go to the Options page in Visual Studio and set 'Editing' to 'Prompt for exclusive checkouts':
Next time when you are editing a source controlled typed dataset you will get the following question:
Choose the second option (outlined in red) and you'll be fine when checking in.
dasBlog theme by Mads Kristensen