Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
This option will restore the file and allow you to resolve conflict in a merge tool.
Namespace: Microsoft.TeamFoundation.VersionControl.Controls
Assembly: Microsoft.TeamFoundation.VersionControl.Controls (in Microsoft.TeamFoundation.VersionControl.Controls.dll)
Syntax
'Declaration
Public Const ResolveOptionsRestoreFileAndMergeChangesInMergeToolDescription As String
public const string ResolveOptionsRestoreFileAndMergeChangesInMergeToolDescription
public:
literal String^ ResolveOptionsRestoreFileAndMergeChangesInMergeToolDescription
static val mutable ResolveOptionsRestoreFileAndMergeChangesInMergeToolDescription: string
public const var ResolveOptionsRestoreFileAndMergeChangesInMergeToolDescription : String
.NET Framework Security
- Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.