The weave-git-merge skill covers Weave as a per-file, entity-aware Git merge
driver that Git invokes through .gitattributes during merges, rebases and
cherry-picks. It ships with the other skills through install-skills, which
installs the skill only and does not run weave setup; Weave itself must be
configured separately.
Weave can exit 0 while having produced structurally broken output, so the
skill's workflow requires a per-file structural parse check before git add
or git rebase --continue, guards multi-commit rebases with
git rebase --exec, and documents rerunning the whole operation with Git's
built-in merge machinery. That rerun uses
git -c core.attributesFile=/dev/null, which bypasses Weave only where the
configured global attributes file is what selects the driver; tracked
.gitattributes and .git/info/attributes rules stay in force, and the
detailed skill gives the scoped bypass for those sources. The
rebase skill routes garbled or non-parsing resolutions here. See the
detailed skill and
behaviour reference.