✨ Feature Request: Trigger Copilot Workspace on PRs With Merge Conflicts

[vitorfloriano]

Select Topic Area

Product Feedback

Copilot Feature Area

Copilot Workspace

Body

Hi GitHub team,

First off, huge kudos — Copilot Workspace is awesome! It’s been a game-changer for my workflow. It saves me a lot of time and gives me more mobility than anything I’ve used before. The flow of creating a PR in Workspace, then checking out the commit on Codespaces is smooth and efficient. Well done!

That being said, I’d like to suggest a potential enhancement:

---

✨ Feature Idea

Enable the ability to automatically invoke a Copilot Workspace when a pull request incurs merge conflicts — either via a native integration or by exposing this behavior to GitHub Actions or webhooks.

---

🧠 Why

This would streamline a common pain point: resolving merge conflicts. Letting devs handle these conflicts inside a Copilot-powered Workspace would not only reduce friction, but also help less experienced contributors feel more confident.

Bonus points if Copilot could suggest how to resolve conflicts intelligently based on context and Git history.

---

🧩 Git Strategy Integration

This could tie in well with common Git workflows — like rebase vs merge strategies. For example:

• Detect when a PR is out of sync with the base branch and suggest rebasing in Workspace.
• Auto-spawn a Workspace when a merge conflict is detected during a merge queue or protected branch scenario.

GitHub already makes advanced workflows easy with features like merge queues and protected branches — integrating Copilot Workspace into this flow could turn conflict resolution from a chore into a smoother, Copilot-assisted experience.

---

💡 Suggested Enhancements for Workspace Context

To make this workflow even smoother, it would be great if the Workspace could be initialized with:

• A summary of the merge conflict (which files, what areas of code are conflicting)
• Contextual Git history or links to previous commits that caused the conflict
• Suggested resolutions or strategies (e.g., "keep both changes", "prefer base", "combine logic")
• A mini brainstorming prompt or pre-filled notes area powered by Copilot to guide the developer's thinking before they start editing

This kind of guided onboarding into a conflict would reduce decision fatigue and make Copilot even more of a pairing assistant.

---

🛠️ Possible Implementation Ideas

• New webhook or GitHub Action trigger for “PR has merge conflicts”
• Configurable option in .github/workspace.yml to enable auto-creation
• GitHub CLI/Copilot CLI command to spin up a conflict-resolving workspace
• Workspace bootstrapping feature that accepts a payload with metadata or suggestions

If automation isn’t possible yet, even just a "Resolve in Copilot Workspace" button near the conflict alert on the PR page would be a huge win. This could launch a Workspace session pre-loaded with the conflict metadata and Copilot context, helping developers resolve it quickly with assistance.

---

🔍 Double-Checking

I wanted to confirm with the team that I’m not missing any existing features or workflows that could accomplish something similar. If there’s already a recommended approach for handling merge conflicts with Copilot Workspace or any alternative methods, I’d really appreciate any guidance!

---

Would love to hear if something like this is on the roadmap or if there are workarounds available today. Thanks again for all the awesome tools you’re building!

[github-actions[bot]]

💬 Your Product Feedback Has Been Submitted 🎉

Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users.

Here's what you can expect moving forward ⏩

• Your input will be carefully reviewed and cataloged by members of our product teams. 
  • Due to the high volume of submissions, we may not always be able to provide individual responses.
  • Rest assured, your feedback will help chart our course for product improvements.
• Other users may engage with your post, sharing their own perspectives or experiences. 
• GitHub staff may reach out for further clarification or insight. 
  • We may 'Answer' your discussion if there is a current solution, workaround, or roadmap/changelog post related to the feedback.

Where to look to see what's shipping 👀

• Read the Changelog for real-time updates on the latest GitHub features, enhancements, and calls for feedback.
• Explore our Product Roadmap, which details upcoming major releases and initiatives.

What you can do in the meantime 💻

• Upvote and comment on other user feedback Discussions that resonate with you.
• Add more information at any point! Useful details include: use cases, relevant labels, desired outcomes, and any accompanying screenshots.

As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities.

Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐