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

kilo-code-bot[bot] merged 1 commit intoconvoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/headKilo-Org/cloud:convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/headfrom

convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/gt/birch/6cec29f3Kilo-Org/cloud:convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/gt/birch/6cec29f3Copy head branch name to clipboard