versioning

Merge a branch

A real 3-way merge (fork point vs trunk now vs the branch now): applies only what the branch itself changed since it forked. A page both trunk and the branch changed differently since the fork is left on trunk and reported in the response diff.conflicts, not overwritten. Check the response merged flag — false means conflicts remain and the branch was NOT marked merged; resolve them (edit the branch or trunk) and merge again. Refuses a parked or already-merged branch.

post/v1/projects/{slug}/branches/{name}/merge

Request

  • Base URL: https://innernet.live/api
  • URL: https://innernet.live/api/v1/projects/{slug}/branches/{name}/merge
  • Auth: HTTP bearer

Path parameters

slugstring required
namestring required

Response

Returns the commit hash, the merged flag (false when conflicts remain and the branch stays unmerged) and the applied diff (with diff.conflicts when some pages were skipped)

Changes

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