Edit

Share via


GitHttpClientBase.GetPullRequestConflictAsync Method

Definition

Overloads

GetPullRequestConflictAsync(String, String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(String, Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(Guid, String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(Guid, Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

GetPullRequestConflictAsync(String, String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(string project, string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : string * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : string * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

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

GetPullRequestConflictAsync(String, Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(string project, Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : string * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : string * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

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

GetPullRequestConflictAsync(Guid, String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(Guid project, string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : Guid * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : Guid * string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

project
Guid

Project ID

repositoryId
String
pullRequestId
Int32
conflictId
Int32
userState
Object
cancellationToken
CancellationToken

The cancellation token to cancel operation.

Returns

Applies to

GetPullRequestConflictAsync(String, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(string repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : string * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

repositoryId
String
pullRequestId
Int32
conflictId
Int32
userState
Object
cancellationToken
CancellationToken

The cancellation token to cancel operation.

Returns

Applies to

GetPullRequestConflictAsync(Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

repositoryId
Guid
pullRequestId
Int32
conflictId
Int32
userState
Object
cancellationToken
CancellationToken

The cancellation token to cancel operation.

Returns

Applies to

GetPullRequestConflictAsync(Guid, Guid, Int32, Int32, Object, CancellationToken)

[Preview API] Retrieve one conflict for a pull request by ID

public virtual System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict> GetPullRequestConflictAsync(Guid project, Guid repositoryId, int pullRequestId, int conflictId, object userState = null, System.Threading.CancellationToken cancellationToken = null);
abstract member GetPullRequestConflictAsync : Guid * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>
override this.GetPullRequestConflictAsync : Guid * Guid * int * int * obj * System.Threading.CancellationToken -> System.Threading.Tasks.Task<Microsoft.TeamFoundation.SourceControl.WebApi.GitConflict>

Parameters

project
Guid

Project ID

repositoryId
Guid
pullRequestId
Int32
conflictId
Int32
userState
Object
cancellationToken
CancellationToken

The cancellation token to cancel operation.

Returns

Applies to