TFS project working simultaneously on two branches

we have a .net framework 1.1 project deploy on production server. we want to migrate it to .net framew开发者_如何转开发ork 4. 1 team will continue to fix bugs on the .net1.1 with VS2003 and other team will work on migrating to .net4 with VS2010. at some point in the future the 2 teams need to merge their changes. we want that the next version to production will be in .net framework 4.

what is the prefer way to do this in TFS aspects?

Thanks.

I'd suggest you make a release branch of the existing version and migrate your trunk (base) to .Net 4. Merge every change in the release branch to the trunk. Changes to plain code files won't be a problem, changes to generated and project files will have to be made manually in the trunk.

Further to Gerrie's answer, you could take this one step further and strike a release branch for your current production code, and then create two branches.

One branch which will continue as a 1.1 branch for continued development, the other can be upgrade to 4.

Any changes made in the 1.1 branch should be merged up to the trunk and back down to the 4 branch, so that at anytime in the future you can push your 4 branch up to the trunk.

See this answer for more information