gitwand.app

resolve_conflict

Resolve a file containing git conflict markers, and file it into the Merge Room on this page. Hunks that carry no real decision (identical edits on both sides, pure reordering, whitespace, insertions at different positions, generated files) are resolved deterministically. Hunks where the two branches genuinely disagree are NOT resolved: they queue for the person at the page to pick a side, and this tool cannot make that call. Returns a per-hunk classification with the pattern name, confidence score and reason for each. No model is involved and nothing is guessed. Runs in the browser tab: the file content is never uploaded.

Page: /agent

Input schema

{
  "type": "object",
  "properties": {
    "content": {
      "type": "string",
      "description": "The complete conflicted file, including the <<<<<<<, ======= and >>>>>>> markers. Pass the whole file, not just the conflicted region."
    },
    "filePath": {
      "type": "string",
      "description": "Path of the file, e.g. \"src/config.json\" or \"pnpm-lock.yaml\". This changes the result: the extension selects format-aware resolvers (JSON, YAML, TypeScript imports, Vue SFC, CSS, lockfiles) and the path is what identifies a generated file. Pass the real path when you have it."
    }
  },
  "required": [
    "content"
  ]
}