Share via


Resolving Folder Differences and File Conflicts (Team Foundation Version Control)

This section contains topics that describe how to solve conflicts that occur between server versions of folders and files and versions that have pending changes in your local workspace.

In This Section

Reference

Team Foundation Version Control Command-Line Reference

See Also

Other Resources

Working with Team Foundation Version Control