Export (0) Print
Expand All

Resolve Command

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

Required Permissions

To use the resolve command, you must be either the workspace owner or have the global Administer workspaces permission set to Allow. You must also have the Read and Check out permissions for the items involved in a resolve operation set to Allow. For more information, see Team Foundation Server Permissions.

tf resolve [itemspec] 
[/auto:(AcceptMerge|AcceptTheirs|AcceptYours|OverwriteLocal|DeleteConflict|AcceptYoursRenameTheirs)] 
[/preview] [/overridetype:overridetype] [/recursive] [/newname:path]
tf resolve [itemspec] 
[/auto:(AcceptMerge|AcceptTheirs|AcceptYours|OverwriteLocal|DeleteConflict|AcceptYoursRenameTheirs)] 
[/preview] [/converttotype:converttype] [/recursive] [/newname:path]

Argument

Description

Itemspec

Used to identify the file or folder for which to resolve version conflicts. If omitted, all items with conflicts will be included. For more information about how Team Foundation Server parses itemspecs to determine which items are within scope, see Command-Line Syntax (Team System).

overridetype

Used with the /overridetype option. Specifies the encoding type of the files involved. For example; binary.

converttype

Used with the /converttotype option. Specifies the encoding type, such as "unicode."

path

Used with the /newname option. Specifies the new path of the affected file or folder

Option

Description

/auto

Resolves outstanding conflicts between different versions of specified items in the current workspace using one of the following options:

  • AcceptMerge   Automatically reconciles non-overlapping content differences between the specified workspace version of an item and the latest server version.

    If differences cannot be reconciled automatically, either because the file is binary or because the workspace and server versions contain overlapping content changes, the conflict remains unresolved pending the selection of one of the following manual merge options.

  • The AcceptTheirs option instructs Team Foundation Server to overwrite workspace revisions with the server revision. Further, for conflicts generated by running the Merge command, this option accepts the changes from the source of the merge and overwrites the changes in the target.

  • The AcceptYours option instructs Team Foundation Server to keep your changes and discard the changes in the server version of an item. For conflicts generated by running the Merge command, this option discards the changes from the source of the merge and leaves the target unchanged.

  • The OverwriteLocal option overwrites the file in your workspace with the server version. This is used to resolve conflicts that arise from a writable file in your workspace.

  • The DeleteConflict option removes a conflict from the conflict table, and the option/description table.

  • The AcceptYoursRenameTheirs option accepts the contents and name of your file and renames their file to a new name that the user specifies. This option requires a single-item filespec, and the /newname option must also be included.

/preview

Displays current conflicts but does nothing with them.

/overridetype

Specifies optional encoding for files involved in a three-way merge. The files are treated as the specified encoding. You must determine the correct encoding. Team Foundation Server saves the resulting merge output in the specified encoding in your workspace. For more information about file encodings, see File Types.

NoteNote:

You cannot specify both an /overridetype and a /converttotype.

/converttotype

Specifies the encoding used for temporary conversion for the input in a three-way merge operation. The merge output is saved in the specified encoding in your workspace. This option is an advanced option and seldom used. For more information about file encodings, see File Types.

NoteNote:

You cannot specify both an /overridetype and a /converttotype.

/recursive

Resolves items in the specific directory and subdirectories.

/newname

Option used to resolve a name collision conflict. Can only be used in conjunction with AcceptMerge and AcceptYoursRenameTheirs. With AcceptMerge, /newname is only valid with conflicts that involve rename and/or undelete. If used, you must supply a new path.

You can use the Resolve command to select a resolution for pending changes that conflict with the server version.

If version conflicts are detected between your version and the version on the destination server during a get, check-in, or merge operation, a prompt appears for you to select a conflict resolution using the resolve command. You must resolve conflicts before you can check in your pending changes.

For more information on how to find the tf command-line utility, see Tf Command-Line Utility Commands.

The following example invokes the Resolve Conflicts dialog box so that you can tell Team Foundation Server how to deal with pending changes that conflict with the server version.

tf resolve

The following example attempts to resolve all conflicts by merging the changes.

tf resolve /auto:acceptmerge

Community Additions

ADD
Show:
© 2014 Microsoft