Defame1297
edcc57c0d6
Two related simplification-audit findings, bundled because they edit some of the same skill-audit files and splitting would fragment single-file diffs. Finding 10: delete 48 per-skill/reference README.md files (they restated SKILL.md in narrative form and no agent ever loads them) plus 2 scaffold templates. Drop the README criterion from skill-audit's file-structure.md and finding-criteria.md, and the README-generation step from skill-author's new-skill.sh; update new-skill.bats to match. Plugin-root READMEs are kept intentionally, out of scope. Finding 12: strip historical ADR-0020/ADR-0023 citations and changelog-style narration from model-facing skill content across kyberforge and git plugin skills. Delete skill-author's one-time retrofit.md migration guide and its references. Some ADR-0023 tags were not narration but check-rtk-prefix's required opt-out marker for intentionally-bare git commands -- those were restored, not stripped. Mirror re-synced and full pre-commit/pre-push suite verified green. Refs: SIMPLIFICATION-AUDIT.md findings 10, 12 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YR2CjVumUbEGWcMikcoXBD
1.4 KiB
1.4 KiB
source_keys
| source_keys | ||
|---|---|---|
|
Merging one branch into another
Scope is fast-forward and merge-commit mechanics plus conflict resolution. Rebase and cherry-pick
belong to git-commits; revert to git-history.
- Fast-forward —
rtk git merge <branch>advances the pointer with no merge commit when the target has not diverged. - True merge —
rtk git merge --no-ff <branch>forces a merge commit even when a fast-forward is possible. Gitflow requires it on every supporting-branch merge. - Squash merge —
rtk git merge --squash <branch>stages the combined diff without committing. Follow it with artk git commit. - Octopus merge —
rtk git merge branch-a branch-b branch-cmerges more than two branches at once, but fails outright on any conflict. Use sequential two-way merges when conflicts are likely.
Conflict resolution
When Git cannot auto-merge it writes conflict markers and stops mid-merge. Run rtk git status to
list the conflicted files, edit each to resolve its markers, then rtk git add <file> and
rtk git merge --continue.
rtk git merge --abortrestores the pre-merge state.git mergetoolopens the configured merge tool — bare, notrtk: it hands control to an interactive child process, and a token filter has nothing to offer there.rtk git diff --diff-filter=Ushows only the still-conflicted files.