GitHttpClientBase.UpdatePullRequestConflictsAsync 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
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, Guid, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, String, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, Guid, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
| UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, String, Int32, Object, CancellationToken) |
[Preview API] Update multiple merge conflict resolutions |
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, Guid repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- repositoryId
- Guid
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, string repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- repositoryId
- String
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, Guid, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, Guid project, Guid repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- project
- Guid
Project ID
- repositoryId
- Guid
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, Guid, String, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, Guid project, string repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * Guid * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- project
- Guid
Project ID
- repositoryId
- String
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, Guid, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, string project, Guid repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * Guid * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- project
- String
Project ID or project name
- repositoryId
- Guid
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.
Returns
Applies to
UpdatePullRequestConflictsAsync(IEnumerable<GitConflict>, String, String, Int32, Object, CancellationToken)
[Preview API] Update multiple merge conflict resolutions
public virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>> UpdatePullRequestConflictsAsync(System.Collections.Generic.IEnumerable<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> conflictUpdates, string project, string repositoryId, int pullRequestId, object userState = null, System.Threading.CancellationToken cancellationToken = null);abstract member UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>
override this.UpdatePullRequestConflictsAsync : seq<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> * string * string * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<System.Collections.Generic.List<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflictUpdateResult>>Parameters
- conflictUpdates
- IEnumerable<GitConflict>
- project
- String
Project ID or project name
- repositoryId
- String
- pullRequestId
- Int32
- userState
- Object
- cancellationToken
- CancellationToken
The cancellation token to cancel operation.