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.
Some of the conflicts are being resolved by a manual merge.Stop waiting on the manual merge?
Namespace: Microsoft.TeamFoundation.VersionControl.Controls
Assembly: Microsoft.TeamFoundation.VersionControl.Controls (in Microsoft.TeamFoundation.VersionControl.Controls.dll)
Syntax
'Declaration
Public Const DialogResolveMultipleMergeToolsInProgress As String
public const string DialogResolveMultipleMergeToolsInProgress
public:
literal String^ DialogResolveMultipleMergeToolsInProgress
static val mutable DialogResolveMultipleMergeToolsInProgress: string
public const var DialogResolveMultipleMergeToolsInProgress : 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.