gitlab

Settle Sync Conflict

Settle a sync paused on a conflict, for the side the admin keeps (ENG-2054): where both changed the same lines that side's lines win, every other change from both sides stays, and the result is pushed. fingerprint names the conflict the admin was shown (model_mirror.conflict_summary): a conflict that changed since, recorded or met by the pull, is never settled and is answered 409 with its files to choose for.

post/api/gitlab/sync/settle

Request

  • Base URL: https://app.getdot.ai (the document declares no server; this is the origin it was published from)
  • URL: https://app.getdot.ai/api/gitlab/sync/settle
  • Auth: one of:
    • API key in header X-API-KEY
    • API key in cookie Authorization
    • OAuth 2 (password, token URL /api/auth/token)

Request body

keep'dot' | 'gitlab' required
fingerprintstring required

Response

Successful Response

unknown required

Changes

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