feat(gastown): auto-resolve merge conflicts on PRs (#2427)#2484

Merged

jrf0110 merged 5 commits intogastown-stagingfrom

convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/head

Apr 18, 2026

Commits on Apr 15, 2026

feat(gastown): add auto_resolve_merge_conflicts setting to schemas and UI (#2473)

jrf0110
and
John Fawcett
authored
feat(gastown): extend GitHubPRStatusSchema with mergeable_state and wire conflict detection (#2474)

jrf0110
and
John Fawcett
authored
feat(gastown): add pr_conflict_context to PrimeContext and consolidate conflict+feedback into single agent dispatch (#2477)

jrf0110
and
John Fawcett
authored

Commits on Apr 17, 2026