Something went wrong. Try again.
Monorepo for Tangled forked from tangled.org/core
Something went wrong. Try again.
JSON
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697{ "lexicon": 1, "id": "sh.tangled.git.mergeCheck", "defs": { "main": { "type": "procedure", "description": "Check if a merge is possible between two branches. Performs 3-way merge check", "input": { "encoding": "application/json", "schema": { "type": "object", "required": ["repo", "branch", "source"], "properties": { "repo": { "type": "string", "format": "did", "description": "DID of Git repository" }, "branch": { "type": "string", "description": "Target branch to merge into" }, "source": { "type": "object", "required": ["repo", "commit"], "properties": { "repo": { "type": "string", "format": "did", "description": "DID of source git repository" }, "commit": { "type": "string", "description": "Head commit ID of PR to merge" } } } } } }, "output": { "encoding": "application/json", "schema": { "type": "object", "required": ["isConflicted"], "properties": { "isConflicted": { "type": "boolean", "description": "Whether the merge has conflicts" }, "conflicts": { "type": "array", "description": "List of files with merge conflicts", "items": { "type": "ref", "ref": "#conflictInfo" } }, "message": { "type": "string", "description": "Additional message about the merge check" } } } }, "errors": [ { "name": "InvalidRequest", "description": "Invalid request parameters" }, { "name": "RepoNotFound", "description": "Repo is not registered on this knot" }, { "name": "CommitNotFound", "description": "Commit is not found from source Repo" } ] }, "conflictInfo": { "type": "object", "required": ["filename", "reason"], "properties": { "filename": { "type": "string", "description": "Name of the conflicted file" }, "reason": { "type": "string", "description": "Reason for the conflict" } } } }}