| Field | Type | Description |
|---|---|---|
filePath | String! | File path; the file ID when neither side has a path. |
fileType | String! | |
fileId | String | |
hasConflicts | Boolean! | Whether the file has conflicts that block an automatic merge. |
conflictCount | Int! | |
conflictRegions | [ConflictRegion!]! | |
isNew | Boolean! | The merge adds the file to the target. |
isDeleted | Boolean! | The merge deletes the file from the target. |
isModified | Boolean! | The merge changes the file in the target. |
baseChanged | Boolean! | The target changed the file since the branch was created. |
branchChanged | Boolean! | The branch changed the file. |
baseContent | String | |
targetContent | String | |
sourceContent | String |
BranchMergeFileDiff
Response type in the GraphQL API.