Resolves conflicts between changed items in your workspace and the latest or destination versions of items on the server. ...

Resolves conflicts between changed items in your workspace and the latest
or destination versions of items on the server.

tf resolve [itemspec] [/auto:(AutoMerge|TakeTheirs|KeepYours|
           OverwriteLocal|DeleteConflict|KeepYoursRenameTheirs)]
           [/preview] [/recursive] [/newname:path] [/noprompt]
           [(/overridetype:overridetype | /converttotype:converttype)]
           [/login:username,[password]]
English
English (United States)
Español (España)
Spanish (Spain)
Français (France)
French (France)
italiano
Italian
日本語
Japanese
한국어
Korean
Русский
Russian