Resolve GitHub sync conflicts

Changed on

<Info>This API is in beta. Endpoints, fields, and behavior may still change, so avoid depending on it in production.</Info>

Asks the AI to resolve the merge conflicts left by a pull from GitHub.

Call this after Pull changes from GitHub reports a merge conflict. Base44 runs an AI 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. The response comes back only when the run ends, which can take minutes.

Resolution always lands on the repository's default branch.

post/api/apps/{app_id}/github/sync/resolve-conflicts

Request

  • Base URL: https://app.base44.com
  • URL: https://app.base44.com/api/apps/{app_id}/github/sync/resolve-conflicts
  • Auth: HTTP bearer

Path parameters

app_idstring required

ID of the app whose GitHub sync this affects.

Response

How the resolution run ended.

status'resolved' | 'needs_input' | 'apply_pending' | 'conflict' | 'failed' required

Final status of a conflict-resolution run.

Changes