---
title: "Resolve GitHub sync conflicts"
method: POST
path: "/api/apps/{app_id}/github/sync/resolve-conflicts"
---

# Resolve GitHub sync conflicts

`POST /api/apps/{app_id}/github/sync/resolve-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](/api-reference/pull-changes-from-github) reports a merge conflict. Base44 runs a builder [turn](/developers/references/app-management/get-started/concepts#turns) 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. The response comes back only when the run ends, which can take minutes.

Resolution always lands on the repository's default branch.

## Path parameters

- `app_id` string, required — ID of the app whose GitHub sync this affects.

## Response `200`

How the resolution run ended.

- ResolveConflictsResponse — Outcome of a conflict-resolution run.
  - `status` 'resolved' | 'needs_input' | 'apply_pending' | 'conflict' | 'failed', required — Final status of a conflict-resolution run.

## Other responses

- `400` — The app's workspace is out of credits, so the resolution turn can't run.
- `401` — Missing or invalid credentials.
- `403` — You don't have access to this app, or you used a workspace API key. These endpoints take a personal API key.
- `404` — App not found, or the app has no active GitHub connection.
- `409` — The builder is busy with another turn. Wait for it to finish and try again.
- `429` — Rate limit exceeded. The base limit is 20 requests per minute, and this endpoint shares it with [Pull changes from GitHub](/api-reference/pull-changes-from-github). See [Rate limits](/developers/references/app-management/get-started/rate-limits) for the multiplier your plan gets.

---

[API](https://skmtc.dev/adexad/apis/base44-app-management-api.md) · [All operations](https://skmtc.dev/adexad/apis/base44-app-management-api/llms.txt) · [OpenAPI document](https://skmtc-service-production.skmtc.workers.dev/v1/apis/adexad/base44-app-management-api/revisions/6ad855bf424f/schema)