@graftsync/skill 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/SKILL.md +6 -2
- package/package.json +1 -1
package/SKILL.md
CHANGED
|
@@ -217,8 +217,12 @@ When asked to capture a modification as a graft (new, or migrating an existing p
|
|
|
217
217
|
- To create one in a fork that is the product: `graft add <id> --package <name> --mechanism fork
|
|
218
218
|
--in-place --version <upstream version or version+commit>` from the fork's checkout.
|
|
219
219
|
- **In place** (variant `{ "ref": "@worktree", "base": "@verified" }`): never write a new
|
|
220
|
-
variant. A green sync puts the new `verified` only in the result branch; adopt it
|
|
221
|
-
|
|
220
|
+
variant. A green sync puts the new `verified` only in the result branch; adopt it as a merge
|
|
221
|
+
of the upstream commit it sits on (`upstream` in the report's `materialized.fetch` /
|
|
222
|
+
`agentStart`), so the fork keeps upstream in its history: `git fetch <repo> <ref> && git merge
|
|
223
|
+
--no-ff --no-commit -s ours --allow-unrelated-histories <upstream> && git read-tree -u --reset
|
|
224
|
+
FETCH_HEAD`, then commit. Never adopt by a plain tree swap or by checking out the result branch
|
|
225
|
+
(that drops the fork's history). On the `-agent` branch,
|
|
222
226
|
graft.md already says the target version (`status: conflicted`): resolve, then
|
|
223
227
|
`graft sync --version <target>` checks the working tree as it is; then run the project's checks.
|
|
224
228
|
- **Start from the prepared branch.** On `needs-agent`, the report's "Start from" line names
|