Skip to content

[WIP] Add GitHub Action for merge conflict resolution#35

Closed
yashmehrotra with Copilot wants to merge 1 commit into
gh-pagesfrom
copilot/create-github-action-merge-conflict
Closed

[WIP] Add GitHub Action for merge conflict resolution#35
yashmehrotra with Copilot wants to merge 1 commit into
gh-pagesfrom
copilot/create-github-action-merge-conflict

Conversation

Copilot AI commented Feb 27, 2026

Copy link
Copy Markdown

Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.

Create a github action that triggers when there is a merge conflict on any PR, it then rebases with the main branch and runs helm repo index --merge index.yaml . to resolve the conflict if it is only with index.yaml file and pushes the changes in the PR and PR gets auto merged


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants