integration: Add AI-driven conflict resolution#1251

ed-irl wants to merge 4 commits into

ed-irl/integration-merge-driversabhinav/git-spice:ed-irl/integration-merge-driversfrom

ed-irl/integration-auto-resolveabhinav/git-spice:ed-irl/integration-auto-resolveCopy head branch name to clipboard