Skip to content

feat(inkless:release): add prep/upstream-sync skills and cherry-pick tooling#718

Draft
jeqo wants to merge 1 commit into
jeqo/changelogfrom
jeqo/upstream-sync-skills
Draft

feat(inkless:release): add prep/upstream-sync skills and cherry-pick tooling#718
jeqo wants to merge 1 commit into
jeqo/changelogfrom
jeqo/upstream-sync-skills

Conversation

@jeqo

@jeqo jeqo commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Add the inkless-release-prep and inkless-upstream-sync agent skills and refresh the inkless-sync docs/prompts. Enhance the cherry-pick flow:

  • branch-consistency.sh --check: exit non-zero only on actionable-missing commits (matched by PR number; old below-window commits do not count), for CI gates.
  • cherry-pick-to-release.sh: stop on first conflict (never auto-abort-and-continue, which reordered picks); restore version-owned files (gradle.properties/Makefile/ .env) to the branch value after every pick so version bumps land without changing the branch version; --dry-run reports version-owned handling and no longer requires a clean worktree.

Branch-specific divergences are handled in history (cherry-pick + sync(revert):/ sync(align):), documented in the skill and README -- no skip-list side file.

…tooling

Add the inkless-release-prep and inkless-upstream-sync agent skills and refresh
the inkless-sync docs/prompts. Enhance the cherry-pick flow:

- branch-consistency.sh --check: exit non-zero only on actionable-missing commits
  (matched by PR number; old below-window commits do not count), for CI gates.
- cherry-pick-to-release.sh: stop on first conflict (never auto-abort-and-continue,
  which reordered picks); restore version-owned files (gradle.properties/Makefile/
  .env) to the branch value after every pick so version bumps land without changing
  the branch version; --dry-run reports version-owned handling and no longer
  requires a clean worktree.

Branch-specific divergences are handled in history (cherry-pick + sync(revert):/
sync(align):), documented in the skill and README -- no skip-list side file.
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