integration: Move regeneration out of merge driver#1252

ed-irl wants to merge 5 commits into

ed-irl/integration-auto-resolveabhinav/git-spice:ed-irl/integration-auto-resolvefrom

ed-irl/integration-regenerateabhinav/git-spice:ed-irl/integration-regenerateCopy head branch name to clipboard