Add merge conflict resolver skill - #49093
Merged
Merged
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 091aa0f9-8aca-4b4c-b2ba-8d92358cca49
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a repository skill to safely resolve generated workflow lock-file merge conflicts.
Changes:
- Documents usage and safety constraints.
- Adds merge, recompile, staging, and validation automation.
- Refuses automatic handling of source conflicts.
Show a summary per file
| File | Description |
|---|---|
.github/skills/resolve-merge-conflicts/SKILL.md |
Defines the skill workflow and safeguards. |
.github/skills/resolve-merge-conflicts/resolve.sh |
Implements conflict detection and lock regeneration. |
Review details
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 2/2 changed files
- Comments generated: 2
- Review effort level: Medium
Comment on lines
+35
to
+38
| merge_in_progress=false | ||
| if git rev-parse -q --verify MERGE_HEAD >/dev/null; then | ||
| merge_in_progress=true | ||
| else |
| fi | ||
|
|
||
| echo "Merging $base_ref without committing..." | ||
| if ! git merge --no-edit --no-commit "$base_ref"; then |
Contributor
|
🎉 This pull request is included in a new release. Release: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
resolve-merge-conflictsskill for merging a base ref and handling compiled workflow conflicts.github/workflows/*.lock.ymlconflicts withmake recompilein one commandValidation
make agent-report-progress