Files
fusion/.changeset/auto-resolve-merge-conflicts.md

272 B

@gsxdsm/fusion
@gsxdsm/fusion
minor

Add automatic merge conflict resolution for auto-merge. When enabled, the system will intelligently auto-resolve lock files and generated files, and retry failed merges with escalating strategies (AI → auto-resolve → merge -X theirs).