GitConflictDeleteRename.yml

### YamlMime:TSType
name: GitConflictDeleteRename
uid: azure-devops-extension-api.GitConflictDeleteRename
package: azure-devops-extension-api
summary: Data object for RenameDelete conflict
fullName: GitConflictDeleteRename
remarks: ''
isDeprecated: false
type: interface
properties:
  - name: baseBlob
    uid: azure-devops-extension-api.GitConflictDeleteRename.baseBlob
    package: azure-devops-extension-api
    summary: ''
    fullName: baseBlob
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'baseBlob: GitBlobRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitBlobRef" />
  - name: resolution
    uid: azure-devops-extension-api.GitConflictDeleteRename.resolution
    package: azure-devops-extension-api
    summary: ''
    fullName: resolution
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'resolution: GitResolutionPickOneAction'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitResolutionPickOneAction" />
  - name: targetBlob
    uid: azure-devops-extension-api.GitConflictDeleteRename.targetBlob
    package: azure-devops-extension-api
    summary: ''
    fullName: targetBlob
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'targetBlob: GitBlobRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitBlobRef" />
  - name: targetNewPath
    uid: azure-devops-extension-api.GitConflictDeleteRename.targetNewPath
    package: azure-devops-extension-api
    summary: ''
    fullName: targetNewPath
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'targetNewPath: string'
      return:
        description: ''
        type: string
inheritedProperties:
  - name: conflictId
    uid: azure-devops-extension-api.GitConflictDeleteRename.conflictId
    package: azure-devops-extension-api
    summary: ''
    fullName: conflictId
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'conflictId: number'
      return:
        description: ''
        type: number
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.conflictId](xref:azure-devops-extension-api.GitConflict.conflictId)
  - name: conflictPath
    uid: azure-devops-extension-api.GitConflictDeleteRename.conflictPath
    package: azure-devops-extension-api
    summary: ''
    fullName: conflictPath
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'conflictPath: string'
      return:
        description: ''
        type: string
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.conflictPath](xref:azure-devops-extension-api.GitConflict.conflictPath)
  - name: conflictType
    uid: azure-devops-extension-api.GitConflictDeleteRename.conflictType
    package: azure-devops-extension-api
    summary: ''
    fullName: conflictType
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'conflictType: GitConflictType'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitConflictType" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.conflictType](xref:azure-devops-extension-api.GitConflict.conflictType)
  - name: mergeBaseCommit
    uid: azure-devops-extension-api.GitConflictDeleteRename.mergeBaseCommit
    package: azure-devops-extension-api
    summary: ''
    fullName: mergeBaseCommit
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'mergeBaseCommit: GitCommitRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitCommitRef" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.mergeBaseCommit](xref:azure-devops-extension-api.GitConflict.mergeBaseCommit)
  - name: mergeOrigin
    uid: azure-devops-extension-api.GitConflictDeleteRename.mergeOrigin
    package: azure-devops-extension-api
    summary: ''
    fullName: mergeOrigin
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'mergeOrigin: GitMergeOriginRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitMergeOriginRef" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.mergeOrigin](xref:azure-devops-extension-api.GitConflict.mergeOrigin)
  - name: mergeSourceCommit
    uid: azure-devops-extension-api.GitConflictDeleteRename.mergeSourceCommit
    package: azure-devops-extension-api
    summary: ''
    fullName: mergeSourceCommit
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'mergeSourceCommit: GitCommitRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitCommitRef" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.mergeSourceCommit](xref:azure-devops-extension-api.GitConflict.mergeSourceCommit)
  - name: mergeTargetCommit
    uid: azure-devops-extension-api.GitConflictDeleteRename.mergeTargetCommit
    package: azure-devops-extension-api
    summary: ''
    fullName: mergeTargetCommit
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'mergeTargetCommit: GitCommitRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitCommitRef" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.mergeTargetCommit](xref:azure-devops-extension-api.GitConflict.mergeTargetCommit)
  - name: resolutionError
    uid: azure-devops-extension-api.GitConflictDeleteRename.resolutionError
    package: azure-devops-extension-api
    summary: ''
    fullName: resolutionError
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'resolutionError: GitResolutionError'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitResolutionError" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.resolutionError](xref:azure-devops-extension-api.GitConflict.resolutionError)
  - name: resolutionStatus
    uid: azure-devops-extension-api.GitConflictDeleteRename.resolutionStatus
    package: azure-devops-extension-api
    summary: ''
    fullName: resolutionStatus
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'resolutionStatus: GitResolutionStatus'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.GitResolutionStatus" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.resolutionStatus](xref:azure-devops-extension-api.GitConflict.resolutionStatus)
  - name: resolvedBy
    uid: azure-devops-extension-api.GitConflictDeleteRename.resolvedBy
    package: azure-devops-extension-api
    summary: ''
    fullName: resolvedBy
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'resolvedBy: IdentityRef'
      return:
        description: ''
        type: <xref uid="azure-devops-extension-api.IdentityRef" />
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.resolvedBy](xref:azure-devops-extension-api.GitConflict.resolvedBy)
  - name: resolvedDate
    uid: azure-devops-extension-api.GitConflictDeleteRename.resolvedDate
    package: azure-devops-extension-api
    summary: ''
    fullName: resolvedDate
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'resolvedDate: Date'
      return:
        description: ''
        type: Date
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.resolvedDate](xref:azure-devops-extension-api.GitConflict.resolvedDate)
  - name: url
    uid: azure-devops-extension-api.GitConflictDeleteRename.url
    package: azure-devops-extension-api
    summary: ''
    fullName: url
    remarks: ''
    isDeprecated: false
    syntax:
      content: 'url: string'
      return:
        description: ''
        type: string
    inheritanceDescription: >-
      <b>Inherited From</b>
      [GitConflict.url](xref:azure-devops-extension-api.GitConflict.url)
extends: <xref uid="azure-devops-extension-api.GitConflict" />