GitHttpClientBase.UpdatePullRequestConflictAsync Method
Definition
Important
Some information relates to prerelease product that may be substantially modified before it’s released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
Overloads
| UpdatePullRequestConflictAsync(GitConflict, String, String, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
| UpdatePullRequestConflictAsync(GitConflict, String, Guid, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
| UpdatePullRequestConflictAsync(GitConflict, Guid, String, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
| UpdatePullRequestConflictAsync(GitConflict, String, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
| UpdatePullRequestConflictAsync(GitConflict, Guid, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
| UpdatePullRequestConflictAsync(GitConflict, Guid, Guid, Int32, Int32, Object, CancellationToken) |
[Preview API] Update merge conflict resolution |
UpdatePullRequestConflictAsync(GitConflict, String, String, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, string project, string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- project
- String
Project ID or project name
- repositoryId
- String
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictAsync(GitConflict, String, Guid, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, string project, Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- project
- String
Project ID or project name
- repositoryId
- Guid
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictAsync(GitConflict, Guid, String, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, Guid project, string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- project
- Guid
Project ID
- repositoryId
- String
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictAsync(GitConflict, String, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- repositoryId
- String
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictAsync(GitConflict, Guid, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- repositoryId
- Guid
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictAsync(GitConflict, Guid, Guid, Int32, Int32, Object, CancellationToken)
[Preview API] Update merge conflict resolution
public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> UpdatePullRequestConflictAsync(Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict conflict, Guid project, Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.UpdatePullRequestConflictAsync : Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict * Guid * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>Parameters
- conflict
- GitConflict
- project
- Guid
Project ID
- repositoryId
- Guid
- pullRequestId
- Int32
- conflictId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.