---
title: "Get merge request conflicts"
method: GET
path: "/v2/storage/merge-request/{id}/conflicts"
tags: ["Development Branches"]
---

# Get merge request conflicts

`GET /v2/storage/merge-request/{id}/conflicts`

## Request

- Base URL: `https://connection.keboola.com`
- URL: `https://connection.keboola.com/v2/storage/merge-request/{id}/conflicts`
- Auth: one of:
  - API key in header `X-StorageApi-Token`
  - API key in header `X-KBC-ManageApiToken`
  - HTTP bearer
- TypeScript: <https://skmtc.dev/keboola/apis/keboola-storage-api/docs/v2/storage/merge-request/:id/conflicts/get.ts> (a function with typed inputs; its response is checked against the schema)

Returns the list of conflicting configurations between the source (dev) branch and the target (default) branch of the merge request. A conflict means the merge cannot proceed without resolving it (for example, the configuration was changed in both the dev branch and the default branch since the dev branch last took it from the default branch, i.e. branch creation, rebase or reset to default; in projects with a protected default branch any change in the default branch counts).

The endpoint is primarily intended for UI consumption — callers can detect conflicts before attempting a merge. An empty array means the merge request can be merged without conflicts.

## Path parameters

- `id` integer, required

## Response `200`

List of merge conflicts between the dev and default branch. Empty array means no conflicts.

- object[]
  - `message` string, required
  - `componentId` string, required
  - `configurationId` string, required
  - `isDeleted` boolean, required
  - `devBranchVersionIdentifier` string, required
  - `defaultBranchVersionIdentifier` string, required

## Other responses

- `404`: Returned when the merge request does not exist.

---

[API](https://skmtc.dev/keboola/apis/keboola-storage-api.md) - [All operations](https://skmtc.dev/keboola/apis/keboola-storage-api/llms.txt) - [OpenAPI document](https://skmtc.dev/keboola/apis/keboola-storage-api/revisions/34b5ceac0317?raw)