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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

kilo-code-bot merged 1 commit into convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/head from convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/gt/birch/6cec29f3

Apr 15, 2026

+76 −0

Merged

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

feat(gastown): add auto_resolve_merge_conflicts setting to schemas an…

Select a check to view from the sidebar