This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 60bf1734ec55629cb0f1485ade4069fe3afe156b
Merge: 2d7b1ceaea 8f841fb9dd
Author: Stephen Mallette <[email protected]>
AuthorDate: Wed Oct 28 08:43:34 2026 -0400

    Merge branch '3.8-dev'
    
    # Conflicts:
    #       AGENTS.md

 .skills/tinker-merge/DESIGN.md                     |  40 +++
 .skills/tinker-merge/SKILL.md                      | 124 +++++++
 .skills/tinker-merge/scripts/merge-forward.sh      | 367 +++++++++++++++++++++
 AGENTS.md                                          |  14 +-
 bin/agent-setup.sh                                 |   3 +-
 .../dev/developer/development-environment.asciidoc |   4 +-
 docs/src/dev/developer/for-committers.asciidoc     |   7 +
 7 files changed, 552 insertions(+), 7 deletions(-)

diff --cc AGENTS.md
index 5d45b74af1,0df7c14a81..5254945317
--- a/AGENTS.md
+++ b/AGENTS.md
@@@ -3,12 -3,24 +3,15 @@@
  You are a TinkerPop developer working across the entire monorepo—code, tests, 
docs, and website to implement,
  maintain, and validate Apache TinkerPop's graph computing framework and its 
multi-language Gremlin ecosystem.
  
 -## This Branch: 3.8-dev
 -
 -`3.8-dev` is a maintenance branch for the 3.8.x release line. It takes 
non-breaking bug fixes
 -and enhancements only: within the line a change must not alter existing 
behavior, introduce new
 -APIs, change serialization formats, or modify protocols. The rule of thumb is 
that a client of
 -one 3.8.x version must still interact correctly with a server of another. 
Work that fails that
 -test belongs on a later branch. Changes here merge forward toward `master` — 
see
 -`docs/src/dev/developer/for-committers.asciidoc`.
 -
  ## Primary Guidance: Agent Skills
  
- This repository provides development guidance as an [Agent 
Skill](https://agentskills.io) named
- `tinker-dev`. If your tool supports Agent Skills, **activate that skill** for 
detailed,
- task-specific instructions covering build recipes, test evaluation, coding 
conventions, and
- reference material for each Gremlin Language Variant.
+ This repository provides development guidance as [Agent 
Skills](https://agentskills.io):
+ `tinker-dev` for building, testing and coding conventions, `tinker-doc` for 
authoring and
+ revising documentation, `tinker-review` for graph-based review of a pull 
request, and
+ `tinker-merge` for merging work forward through the release branches. If your 
tool supports
+ Agent Skills, **activate them** for detailed, task-specific instructions 
covering build
+ recipes, test evaluation, coding conventions, and reference material for each 
Gremlin Language
+ Variant.
  
  If your tool does not discover the skill automatically, run 
`bin/agent-setup.sh --list` to
  see how to configure it, or `bin/agent-setup.sh <agent>` to set up the 
integration.

Reply via email to