---
title: "Merge Conflict"
description: "Explore comprehensive solutions for managing merge conflicts in repositories, including properties and methods for efficient conflict resolution. (Gitana 4.0)"
product: "Gitana"
version: "4.0"
url: "/documentation/gitana/4.0/reference/types/merge-conflict"
---

# <a id="top"></a>Merge Conflict

An Object

1.  [Platform](/documentation/gitana/4.0/reference/types/platform.md)
2.  [Repository](/documentation/gitana/4.0/reference/types/repository.md)
3.  [Merge Conflict](/documentation/gitana/4.0/reference/types/merge-conflict.md)

##### Table of Contents

- [Overview](#top "Overview")
- [Parent](#parent "Parent")
- [Properties](#properties "Properties")
- [Methods](#methods "Methods")
- [Schema](#schema "Schema")

> **Note:** Drop in one of our language drivers to accelerate your development.  
> Here are links to some of our popular [Cookbooks](/documentation/gitana/4.0/developers/cookbooks/overview.md) to help you get started!
> 
> - [C#](/documentation/gitana/4.0/developers/cookbooks/csharp.md)
> - [Go](/documentation/gitana/4.0/developers/cookbooks/go.md)
> - [Java](/documentation/gitana/4.0/developers/cookbooks/java.md)
> - [JavaScript](/documentation/gitana/4.0/developers/cookbooks/javascript2.md)
> - [PHP](/documentation/gitana/4.0/developers/cookbooks/php.md)
> - [Python](/documentation/gitana/4.0/developers/cookbooks/python.md)
> - [Ruby](/documentation/gitana/4.0/developers/cookbooks/ruby.md)

## <a id="parent"></a>Parent

This Merge Conflict is contained within a [Repository](/documentation/gitana/4.0/reference/types/repository.md).

## <a id="properties"></a>Properties

The following properties are available:

| Property | Type | Default | Read-Only | Description |
| --- | --- | --- | --- | --- |
| \_doc | string |  | No | The primary ID |
| \_system | object |  | No | Metadata maintained by the system |

## <a id="methods"></a>Methods

The following methods are available:

- [Check Permission](#post-repositories-repositoryid-conflicts-conflictid-permissions-permissionid-check "Check Permission")
- [Check Single Authority](#post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-check "Check Single Authority")
- [Check multiple Authorities](#post-repositories-repositoryid-conflicts-authorities-check "Check multiple Authorities")
- [Check multiple Permissions](#post-repositories-repositoryid-conflicts-permissions-check "Check multiple Permissions")
- [Commit Conflict](#post-repositories-repositoryid-conflicts-conflictid-commit "Commit Conflict")
- [Delete Conflict](#delete-repositories-repositoryid-conflicts-conflictid "Delete Conflict")
- [Delete Conflict](#post-repositories-repositoryid-conflicts-conflictid-delete "Delete Conflict")
- [Evaluate Conflict](#post-repositories-repositoryid-conflicts-conflictid-evaluate "Evaluate Conflict")
- [Export Merge Conflict](#post-repositories-repositoryid-conflicts-conflictid-export "Export Merge Conflict")
- [Grant Authority](#post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-grant "Grant Authority")
- [Import Merge Conflict](#post-repositories-repositoryid-conflicts-conflictid-import "Import Merge Conflict")
- [List Conflicts](#get-repositories-repositoryid-conflicts "List Conflicts")
- [Query](#post-repositories-repositoryid-conflicts-query "Query")
- [Read ACL](#get-repositories-repositoryid-conflicts-conflictid-acl-list "Read ACL")
- [Read ACL for Principal](#get-repositories-repositoryid-conflicts-conflictid-acl "Read ACL for Principal")
- [Read Authorities Report](#post-repositories-repositoryid-conflicts-conflictid-authorities "Read Authorities Report")
- [Read Conflict](#get-repositories-repositoryid-conflicts-conflictid "Read Conflict")
- [Resolve Conflict](#post-repositories-repositoryid-conflicts-conflictid-resolve "Resolve Conflict")
- [Revoke Authority](#post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-revoke "Revoke Authority")
- [Update Conflict](#post-repositories-repositoryid-conflicts-conflictid-update "Update Conflict")
- [Update Conflict](#put-repositories-repositoryid-conflicts-conflictid "Update Conflict")

### <a id="post-repositories-repositoryid-conflicts-conflictid-permissions-permissionid-check"></a>Check Permission

Checks whether one or more authorities against the specified merge-conflict are granted for a given set of users

POST /repositories/{repositoryId}/conflicts/{conflictId}/permissions/{permissionId}/check

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| permissionId | true | string | The ID of the permission |
| id | true | string |  |

#### Response

```json
{
  "$ref": "#/components/schemas/checkPermission"
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-check"></a>Check Single Authority

Checks whether a single authority is granted against the specified merge-conflict for the given user

POST /repositories/{repositoryId}/conflicts/{conflictId}/authorities/{authorityId}/check

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| authorityId | true | string | The ID or authority key for the authority |
| id | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Check",
  "extends": "status",
  "properties": {
    "check": {
      "type": "boolean"
    },
    "ok": null
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-authorities-check"></a>Check multiple Authorities

Checks whether one or more authorities against the specified merge-conflict are granted for a given set of users

POST /repositories/{repositoryId}/conflicts/authorities/check

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |

#### Response

```json
{
  "type": "object",
  "description": "Check Multiple Authorities Out",
  "properties": {
    "checks": {
      "type": "array",
      "items": {
        "type": "object",
        "properties": {
          "permissionedId": {
            "type": "string"
          },
          "principalId": {
            "type": "string"
          },
          "authorityId": {
            "type": "string"
          },
          "result": {
            "type": "boolean"
          }
        }
      }
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-permissions-check"></a>Check multiple Permissions

Checks whether one or more permissions against the specified merge-conflict are granted for a given set of users

POST /repositories/{repositoryId}/conflicts/permissions/check

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |

#### Response

```json
{
  "type": "object",
  "description": "Check Multiple Permissions Out",
  "properties": {
    "checks": {
      "type": "array",
      "items": {
        "type": "object",
        "properties": {
          "permissionedId": {
            "type": "string"
          },
          "principalId": {
            "type": "string"
          },
          "permissionId": {
            "type": "string"
          },
          "result": {
            "type": "boolean"
          }
        }
      }
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-commit"></a>Commit Conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/commit

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| branch | false | string |  |

### <a id="delete-repositories-repositoryid-conflicts-conflictid"></a>Delete Conflict

DELETE /repositories/{repositoryId}/conflicts/{conflictId}

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

### <a id="post-repositories-repositoryid-conflicts-conflictid-delete"></a>Delete Conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/delete

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

### <a id="post-repositories-repositoryid-conflicts-conflictid-evaluate"></a>Evaluate Conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/evaluate

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

### <a id="post-repositories-repositoryid-conflicts-conflictid-export"></a>Export Merge Conflict

Starts an export job for this resource

POST /repositories/{repositoryId}/conflicts/{conflictId}/export

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| groupId | false | string | The Group ID to be assigned to the exported archive |
| artifactId | false | string | The Artifact ID to be assigned to the exported archive |
| versionId | false | string | The Version ID to be assigned to the exported archive |
| vaultId | false | string | The ID of the vault where the exported archive should be saved |
| schedule | false | string | Whether to run the job immediately or in the background (either 'synchronous' or 'asynchronous') |

#### Response

```json
{
  "type": "object",
  "description": "Export Configuration",
  "properties": {
    "startDate": {
      "type": "object",
      "description": "Only include objects whose modification date is after this time (epoch millis). This is used for partial or rolling exports."
    },
    "endDate": {
      "type": "object",
      "description": "Only include objects whose modification date is before this time (epoch millis). This is used for partial or rolling exports."
    },
    "startChangeset": {
      "type": "string",
      "description": "Only include data that is relevant to changesets at or beyond the specified changeset."
    },
    "endChangeset": {
      "type": "string",
      "description": "Only include data that is relevant to changesets at or before the specified changeset."
    },
    "includeACLs": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include ACLs during export."
    },
    "includeTeams": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Teams during export."
    },
    "includeActivities": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Activities during export."
    },
    "includeBinaries": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Binaries for data stores during export."
    },
    "includeAttachments": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Attachments for Attachables during export."
    },
    "artifactDependencies": {
      "type": "array",
      "items": {
        "type": "object"
      }
    },
    "artifactIncludes": {
      "type": "array",
      "items": {
        "type": "object"
      }
    },
    "forceIncludes": {
      "type": "boolean"
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-grant"></a>Grant Authority

Grants an authority against the specified merge-conflict to a given user

POST /repositories/{repositoryId}/conflicts/{conflictId}/authorities/{authorityId}/grant

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| authorityId | true | string | The ID or authority key for the authority |
| id | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Status of Operation",
  "properties": {
    "ok": {
      "type": "boolean",
      "description": "Indicates whether the operation succeeded or not"
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-import"></a>Import Merge Conflict

Starts an import job for this resource

POST /repositories/{repositoryId}/conflicts/{conflictId}/import

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| groupId | false | string | The Group ID to be assigned to the exported archive |
| artifactId | false | string | The Artifact ID to be assigned to the exported archive |
| versionId | false | string | The Version ID to be assigned to the exported archive |
| vaultId | false | string | The ID of the vault where the exported archive should be saved |
| schedule | false | string | Whether to run the job immediately or in the background (either 'synchronous' or 'asynchronous') |

#### Response

```json
{
  "type": "object",
  "description": "Import Configuration",
  "properties": {
    "includeACLs": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include ACLs during import."
    },
    "includeTeams": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Teams during import."
    },
    "includeActivities": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Activities during import."
    },
    "includeBinaries": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Binaries for data stores during import."
    },
    "includeAttachments": {
      "type": "boolean",
      "default": true,
      "description": "Whether to include Attachments for Attachables during import."
    },
    "strategy": {
      "type": "array",
      "items": {
        "type": "string"
      },
      "default": "CLONE",
      "description": "Either CLONE or COPY_EVERYTHING. Use CLONE to keep the same IDs on import. Use COPY_EVERYTHING to generate all new IDs for all entries on every import."
    },
    "substitutions": {
      "type": "string"
    }
  }
}
```

### <a id="get-repositories-repositoryid-conflicts"></a>List Conflicts

GET /repositories/{repositoryId}/conflicts

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |

### <a id="post-repositories-repositoryid-conflicts-query"></a>Query

Queries for matches

POST /repositories/{repositoryId}/conflicts/query

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| sort | false | object | Defines how to sort fields in the result set |
| skip | false | number | Skips the result set cursor ahead the specified number of records |
| limit | false | number | Specifies the number of records to be handed back in the result set |

This method supports pagination.

#### Response

```json
{
  "type": "object",
  "description": "Result Map",
  "properties": {
    "total_rows": {
      "type": "number"
    },
    "offset": {
      "type": "number"
    },
    "size": {
      "type": "number"
    },
    "rows": {
      "type": "array",
      "items": {
        "$ref": "#/components/schemas/resultmap"
      }
    }
  }
}
```

### <a id="get-repositories-repositoryid-conflicts-conflictid-acl-list"></a>Read ACL

Read the Access Control List for the specified merge-conflict

GET /repositories/{repositoryId}/conflicts/{conflictId}/acl/list

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Result Map of ACL entries",
  "properties": {
    "total_rows": {
      "type": "number"
    },
    "offset": {
      "type": "number"
    },
    "size": {
      "type": "number"
    },
    "rows": {
      "type": "array",
      "items": {
        "type": "object",
        "properties": {
          "_doc": {
            "type": "string",
            "title": "Principal ID"
          },
          "name": {
            "type": "string",
            "title": "Principal Name"
          },
          "type": {
            "type": "string",
            "title": "Principal Type"
          },
          "domainId": {
            "type": "string"
          },
          "domainQualifiedId": {
            "type": "string"
          },
          "domainQualifiedName": {
            "type": "string"
          },
          "principalId": {
            "type": "string",
            "title": "Principal ID"
          },
          "userEmail": {
            "type": "string"
          },
          "userFirstName": {
            "type": "string"
          },
          "userLastName": {
            "type": "string"
          },
          "authorities": {
            "type": "array",
            "title": "Authorities",
            "items": {
              "type": "string",
              "title": "Authority Key"
            }
          }
        }
      }
    }
  }
}
```

### <a id="get-repositories-repositoryid-conflicts-conflictid-acl"></a>Read ACL for Principal

Reads the ACL for a merge conflict and specific actor

GET /repositories/{repositoryId}/conflicts/{conflictId}/acl

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| id | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Result Map of Authority Keys",
  "properties": {
    "total_rows": {
      "type": "number"
    },
    "offset": {
      "type": "number"
    },
    "size": {
      "type": "number"
    },
    "rows": {
      "type": "array",
      "items": {
        "type": "string",
        "description": "Authority Key"
      }
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-authorities"></a>Read Authorities Report

Read the Authorities Report for the specified merge-conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/authorities

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Authority Report",
  "properties": {
    "principalId": {
      "type": "object",
      "properties": {
        "id": {
          "type": "object",
          "properties": {
            "role-key": {
              "type": "string"
            },
            "principal": {
              "type": "string"
            },
            "permissioned": {
              "type": "string"
            },
            "inheritsFrom": {
              "type": "object",
              "properties": {
                "id": {
                  "type": "string"
                },
                "principal": {
                  "type": "string"
                },
                "permissioned": {
                  "type": "string"
                }
              }
            }
          }
        }
      }
    }
  }
}
```

### <a id="get-repositories-repositoryid-conflicts-conflictid"></a>Read Conflict

GET /repositories/{repositoryId}/conflicts/{conflictId}

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

### <a id="post-repositories-repositoryid-conflicts-conflictid-resolve"></a>Resolve Conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/resolve

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| resolution | false | string |  |

### <a id="post-repositories-repositoryid-conflicts-conflictid-authorities-authorityid-revoke"></a>Revoke Authority

Revokes an authority against the specified merge-conflict from a given user

POST /repositories/{repositoryId}/conflicts/{conflictId}/authorities/{authorityId}/revoke

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |
| authorityId | true | string | The ID or authority key for the authority |
| id | true | string |  |

#### Response

```json
{
  "type": "object",
  "description": "Status of Operation",
  "properties": {
    "ok": {
      "type": "boolean",
      "description": "Indicates whether the operation succeeded or not"
    }
  }
}
```

### <a id="post-repositories-repositoryid-conflicts-conflictid-update"></a>Update Conflict

POST /repositories/{repositoryId}/conflicts/{conflictId}/update

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

### <a id="put-repositories-repositoryid-conflicts-conflictid"></a>Update Conflict

PUT /repositories/{repositoryId}/conflicts/{conflictId}

#### Parameters

| Name | Required | Type | Description |
| --- | --- | --- | --- |
| repositoryId | true | string | The ID of the repository |
| conflictId | true | string |  |

## <a id="schema"></a>Schema

```json

{
  "type": "object",
  "extends": "document",
  "description": "Merge Conflict",
  "container": "repository",
  "properties": {
    "_doc": null,
    "_system": null
  },
  "id": "merge-conflict"
}
```