Repository navigation
Conversation
blafourcade
reviewed
Sep 3, 2026
Contributor
|
Peux-tu résolve les conflits avec le skill resolve-conflits dans cette PR ? 😄 |
Adds 05-resolve-conflict: deterministic conflicts and approved choices apply, anything else returns an unapplied proposal table and stops. Rebased onto next and squashed. The four original commits each replayed the same conflicts against intermediate text; the final tree is unchanged. Conflicts were the plugin version release-please had bumped and the catalogue rows #743 had rewritten, not the skill itself. Refs #747 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FPREgkoNtK4PYh2YyZbztq AIDD-Session-Id: 2261efcd-a873-4e60-9893-2217f702bde2
blafourcade
force-pushed
the
codex/resolve-conflict-skill
branch
from
September 21, 2026 03:49
02e7f21 to
45cba67
Compare
Restore explicit conflict-row and validation-status guarantees.\nIsolate sandboxed Node from globally installed AI tool binaries so local gates remain deterministic.
1 task
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
2 participants
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.
🎯 What & why
Add
aidd-vcs:05-resolve-conflict, a skill that instructs the agent to handle an active merge, rebase, or cherry-pick conflict. It adds no Git resolver to the CLI.🛠️ How it works
The agent records one decision per conflicted hunk or non-text path in the resolution table. Identical sides use common content; a previously approved choice applies only if it still matches. Any undecided choice is proposed without changing files or the index.
Once every choice is decided, the agent applies them, stages only resolved paths, and checks for remaining unmerged paths and staged whitespace errors before marking rows
Applied. It does not commit, continue the Git operation, reset, or discard changes. These are agent instructions, not executable guarantees.🧪 How to verify
git diff --checkpassed. The architecture rules test passed 30/30; the pre-commit scripts suite passed 549/549.expected '' not to be ''.The unrelated Improve changes are covered by #945. The E2E sandbox fix is isolated in #963. Both were removed from this PR's diff.
✅ I certify