Interface GitConflictAddAdd

interface GitConflictAddAdd {
    _links?: any;
    conflictId?: number;
    conflictPath?: string;
    conflictType?: GitConflictType;
    mergeBaseCommit?: GitCommitRef;
    mergeOrigin?: GitMergeOriginRef;
    mergeSourceCommit?: GitCommitRef;
    mergeTargetCommit?: GitCommitRef;
    resolution?: GitResolutionMergeContent;
    resolutionError?: GitResolutionError;
    resolutionStatus?: GitResolutionStatus;
    resolvedBy?: IdentityRef;
    resolvedDate?: Date;
    sourceBlob?: GitBlobRef;
    targetBlob?: GitBlobRef;
    url?: string;
}