Development Branches

Get merge request conflicts

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.

get/v2/storage/merge-request/{id}/conflicts

Request

Path parameters

idinteger required

Response

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

messagestring required
componentIdstring required
configurationIdstring required
isDeletedboolean required
devBranchVersionIdentifierstring required
defaultBranchVersionIdentifierstring required

Changes

No recorded changes to this operation across all 1 revision of this API.