Tolgee Octri Demo
PUT/v2/projects/{projectId}/branches/merge/{mergeId}/resolve

Resolve a branch merge session conflict

Resolves a specific conflict in a branch merge session by choosing the source or target version. Provide the change identifier and resolution in the request body to update the conflict state.

2 parameters · 2 body fields
mergeIdintegerrequired
The merge session identifier as a 64-bit integer.
projectIdintegerrequired
The project identifier as a 64-bit integer.

Conflict resolution details for one merge change.

changeIdintegerrequired
Merge change id
resolvestringrequired
Type of resolution
Allowed:SOURCETARGET

5 status codes
200Returns confirmation that the conflict resolution was applied.
400Returned when the request is invalid or the resolution value is not accepted.
codestringrequired
Allowed:unauthenticatedapi_access_forbiddenapi_key_not_foundinvalid_api_keyinvalid_project_api_keyproject_api_key_expiredbad_credentialsmfa_enabledinvalid_otp_codemfa_not_enabledcan_not_revoke_own_permissionsdata_corrupted
paramsarray<object>optional
401Returned when authentication is missing or invalid.
codestringrequired
Allowed:unauthenticatedapi_access_forbiddenapi_key_not_foundinvalid_api_keyinvalid_project_api_keyproject_api_key_expiredbad_credentialsmfa_enabledinvalid_otp_codemfa_not_enabledcan_not_revoke_own_permissionsdata_corrupted
paramsarray<object>optional
403Returned when you do not have permission to resolve the conflict.
codestringrequired
Allowed:unauthenticatedapi_access_forbiddenapi_key_not_foundinvalid_api_keyinvalid_project_api_keyproject_api_key_expiredbad_credentialsmfa_enabledinvalid_otp_codemfa_not_enabledcan_not_revoke_own_permissionsdata_corrupted
paramsarray<object>optional
404Returned when the project or merge session cannot be found.
codestringrequired
Allowed:unauthenticatedapi_access_forbiddenapi_key_not_foundinvalid_api_keyinvalid_project_api_keyproject_api_key_expiredbad_credentialsmfa_enabledinvalid_otp_codemfa_not_enabledcan_not_revoke_own_permissionsdata_corrupted
paramsarray<object>optional

Error handling

A 400 is returned when the request is invalid. A 401 is returned when authentication is missing or invalid, a 403 when you lack permission, and a 404 when the project or merge session cannot be found. The mergeId and projectId path parameters must identify the session and its project. The body must include changeId and resolve, and resolve must be SOURCE or TARGET.