---
{
  "n": 21,
  "title": "Resolving a merge conflict",
  "abstract": "",
  "refs": [],
  "seen": [
    "system",
    "agent"
  ],
  "data": {
    "starts_on": "",
    "system": true,
    "environment": "main",
    "files": {},
    "started_by": "",
    "only_when_idle": false,
    "talks_in": "",
    "lasting": false,
    "unless": {},
    "dispatch": ""
  },
  "created": 1790367500.140675,
  "updated": 1790367566.700086,
  "deleted": 0.0,
  "completed": 0.0,
  "outcome": "",
  "type": "sequence"
}
---
A ticket's merge was refused because its branch conflicts with the board's branch. Hand it back with exactly what to do.

## Name the conflict
journal ticket show <ticket n> names its environment, its plan and the board it is on. In its worktree, try the merge without committing (git merge --no-commit --no-ff <board branch>, then git merge --abort) to name the conflicting files, and read which merged ticket changed them.

## Hand it to its agent
Tell its agent: journal ticket tell <ticket n> "Rebase onto <board branch>; conflicts in <files>; keep <merged ticket>'s change to <what>." Its next finish starts a fresh merge.