Resolve GitHub sync conflicts
<Info>This API is in beta. Endpoints, fields, and behavior may still change, so avoid depending on it in production.</Info>
Asks the builder to resolve the merge conflicts left by a pull from GitHub.
Call this after Pull changes from GitHub returns error: merge_conflict. Base44 runs a builder turn over the conflicted files, and one more automatic attempt if publishing the resolution finds that GitHub has moved on. The turn consumes credits like any other builder work, so a workspace that is out of credits gets a 400 and no turn runs, and the call holds the connection until it ends, which can take minutes.
status says how it ended. resolved means the resolution is published to the repository. apply_pending means the resolution is ready and still being applied. needs_input means the builder asked a question and is waiting for an answer in the app's chat. conflict means the conflicts are still there and the app's chat carries a fresh conflict card. failed means the turn produced no outcome.
Resolution lands on the repository's default branch, so run it from the app's main chat rather than with a branch selected. This endpoint allows 20 requests per minute per caller, shared with Pull changes from GitHub.
<Note>This endpoint accepts a personal API key. Workspace API keys are not authorized for it and are rejected with a 403.</Note>
Path parameters
ID of the app whose GitHub sync this affects.
ID of the app whose GitHub sync this affects.
Response
How the resolution run ended.