Resolve merge conflicts by: - Keeping version 0.2.2 from refactor branch (next release) - Using fixed gh CLI release workflow from main (atomic release creation) - Merging CHANGELOG histories: installer releases (0.1.x) and protocol work (2.x) Conflicts resolved: - .github/workflows/release.yml: Use gh CLI for atomic releases - CHANGELOG.md: Merged both release histories chronologically - pyproject.toml: Keep 0.2.2 for next refactor release 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| workflows | ||