Merge base branch

Fast-forwards a workspace to incorporate the latest changes from its base branch.

Conflict handling: When explicitly requested by users, conflicts are created and returned as a merge ID for manual resolution. This ensures the workspace is up-to-date with the branch before committing.

Returns:

• 412 Precondition Failed if the workspace is detached
• 503 Service Unavailable if a dependent service is unavailable
• 202 Accepted with merge_id if conflicts occurred
• 200 OK if changes were applied
• 204 No Content if already up-to-date

POST /repos/{repo_id}/workspaces/{workspace_id}/forward

Merge base branch into workspace

cURL

curl --request POST \
  --url https://api.diversion.dev/v0/repos/{repo_id}/workspaces/{workspace_id}/forward \
  --header 'Authorization: Bearer <token>'

202

{
  "merge_id": "example_id"
}

Authorizations

Authorization · string · header · required

This API uses OAuth 2 with the implicit grant flow

Path Parameters

repo_id · string · required

The repo ID of the repository. Repo name can be used instead of the ID, but usage of ID for permanent linking and API requests is preferred.

Required string length: 3 - 128

Example:

"example_id"

workspace_id · string · required

The repo ID of the workspace.

Required string length: 3 - 128

Example:

"example_id"

Response

200

The merge into a workspace was completed successfully