Search
Preparing search index...
The search index is not available
azure-devops-sdk
Options
All
Public
Public/Protected
All
Inherited
Only exported
Menu
Globals
"api/api"
GitConflictEditEdit
Interface GitConflictEditEdit
Data object for EditEdit conflict
Hierarchy
GitConflict
GitConflictEditEdit
Index
Properties
conflict
Id
conflict
Path
links
merge
Base
Commit
merge
Origin
merge
Source
Commit
merge
Target
Commit
resolved
By
resolved
Date
url
Properties
Optional
conflict
Id
conflict
Id
:
number
Optional
conflict
Path
conflict
Path
:
string
Optional
links
links
:
ReferenceLinks
Optional
merge
Base
Commit
merge
Base
Commit
:
GitCommitRef
Optional
merge
Origin
merge
Origin
:
GitMergeOriginRef
Optional
merge
Source
Commit
merge
Source
Commit
:
GitCommitRef
Optional
merge
Target
Commit
merge
Target
Commit
:
GitCommitRef
Optional
resolved
By
resolved
By
:
IdentityRef
Optional
resolved
Date
resolved
Date
:
Date
Optional
url
url
:
string
Globals
"api/api"
"api/wrapper"
"devops"
"helpers/assign"
"helpers/environment"
Git
Conflict
Edit
Edit
conflict
Id
conflict
Path
links
merge
Base
Commit
merge
Origin
merge
Source
Commit
merge
Target
Commit
resolved
By
resolved
Date
url
Generated using
TypeDoc
Data object for EditEdit conflict