PUT/v2/projects/{projectId}/branches/merge/{mergeId}/resolve-all

Resolve all branch merge session conflicts

Resolves every conflict in a branch merge session by choosing either the source or target version. Supply resolve to apply the same resolution across all conflicts in the session.

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

Resolution to apply to all conflicts in the merge session.

resolvestringrequired
The resolution to apply: SOURCE or TARGET.
Allowed:SOURCETARGET

5 status codes
200Returns confirmation that the resolutions were applied to the branch merge session conflicts.
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 conflicts.
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 resolve, which must be SOURCE or TARGET.