Skip to content

Conversation

@mokcontoro
Copy link
Collaborator

Summary

Sync develop branch into main to align commit history.

Changes

  • Merge commit from develop containing all v2.1.0 changes
  • Older develop-specific commits (docs updates)

No code changes - just aligning branch history.

stex2005 and others added 4 commits January 22, 2026 12:07
* docs: add submodule integration guide

Add comprehensive documentation for creating MCP submodules with
integration.py, including examples, configuration patterns, and
the three-level discovery mechanism.
* docs: add detailed Gitflow branching model to CLAUDE.md

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* docs: improve CLAUDE.md with branch structure and PR rules

- Add branch structure table with merge targets
- Add PR rules section for Gitflow workflow
- Use conventional commits format in commit rules
- Clarify release workflow with numbered steps
- Add ruff check to allowed bash commands

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
@mokcontoro mokcontoro merged commit e3cacd1 into main Jan 26, 2026
2 checks passed
@stex2005 stex2005 deleted the sync/develop-to-main branch February 2, 2026 01:16
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.

2 participants