Skip to content

Add practical Weave Git merge skill - #80

Draft
leynos wants to merge 1 commit into
mainfrom
weave-skill
Draft

Add practical Weave Git merge skill#80
leynos wants to merge 1 commit into
mainfrom
weave-skill

Conversation

@leynos

@leynos leynos commented Jul 24, 2026

Copy link
Copy Markdown
Owner

Summary

This branch adds a practical Weave Git merge skill so agents can configure,
inspect and troubleshoot the driver from its actual implementation rather
than relying on the project's limited user documentation.

The guidance explains Git's per-file driver contract, Weave's entity-level
resolution pipeline, fallback boundaries, exit statuses and safe inspection
during merges and rebases.

Review walkthrough

Validation

  • Skill structural validator: passed.
  • git diff --check origin/main...HEAD: passed.
  • Context-isolated forward test against a stopped-rebase troubleshooting scenario: passed; the resulting stage-inspection omission was corrected.
  • make all: formatting, lint, type checking and all 187 tests passed. The repository-wide spelling step remains red only for pre-existing findings in unrelated skills; the new weave-git-merge skill has no spelling findings.

Notes

The skill was derived from the Weave driver, setup command, merge engine,
fallback implementation and integration tests in the local Weave checkout.

Document the driver's real per-file contract, entity resolution pipeline,
fallback boundaries, exit statuses, and safe rebase inspection workflow.

Include discoverable skill metadata and a detailed behavioural reference so
agents can diagnose Weave results from code-backed mechanics rather than the
limited user documentation alone.

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @leynos, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

@coderabbitai

coderabbitai Bot commented Jul 24, 2026

Copy link
Copy Markdown

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 5e34f9af-5ad3-48d5-ba48-471c0ca3228b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch weave-skill

Comment @coderabbitai help to get the list of available commands.

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.

1 participant