BranchMergeFileDiff

One file a merge changes, with the content of each side.

FieldTypeDescription
filePathString!File path; the file ID when neither side has a path.
fileTypeString!
fileIdString
hasConflictsBoolean!Whether the file has conflicts that block an automatic merge.
conflictCountInt!
conflictRegions[ConflictRegion!]!
isNewBoolean!The merge adds the file to the target.
isDeletedBoolean!The merge deletes the file from the target.
isModifiedBoolean!The merge changes the file in the target.
baseChangedBoolean!The target changed the file since the branch was created.
branchChangedBoolean!The branch changed the file.
baseContentString
targetContentString
sourceContentString

All GraphQL types · Operations