Menu
mach-mono git branching, integration, and release workflow — main as canonical branch, topic branches, commit shape, deploy via tags.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
| name | git-flow |
| description | mach-mono git branching, integration, and release workflow — main as canonical branch, topic branches, commit shape, deploy via tags. |
| disable-model-invocation | true |
| argument-hint | ["start|finish|release"] |
Full reference:
docs/AGENT-GUIDELINES.md→ Git Branching and Deployment Constraints. ADR:docs/decisions/0001-main-only-branching.md
| Branch | Role | Rules |
|---|---|---|
main | Canonical integration | Build must be green before push |
topic/ | Short-lived active dev | Naming: feature/, fix/, perf/, refactor/ |
No long-lived dev branch. Work on main directly for small changes, topic branch for anything that takes more than one session.
git checkout main && git pull origin main
git checkout -b feature/my-feature # or fix/, perf/, refactor/
.claude/skills/swift-code-quality rulesbazelisk build //Apps/machNotch:machNotch //Apps/machBrief:machBriefbazelisk test //Apps/machNotch:machNotchTests //Packages/MachBriefKit:MachBriefKitTestsdocs/prds/ and any affected ADRsgit add <specific files>
git commit -m "type(scope): description" # conventional commits
git checkout main && git pull origin main
git merge feature/my-feature # or rebase for linear history
git push origin main
git tag v1.2.3
git push origin v1.2.3 # triggers release workflow
Tag format: v<major>.<minor>.<patch> or v<version>-beta.<n>.
type(scope): short description (< 70 chars)
Optional body — WHY not WHAT. Reference issues if relevant.
Types: feat, fix, chore, refactor, perf, test, docs, ci
Swift code quality rules for mach-mono — 300-line file limit, @Observable, no singletons in views, no direct Defaults access, protocol-based services. Auto-loaded when editing .swift files.
mach-mono visual design rules — minimalistic aesthetic, clarity, cohesion, tech-forward style, iconography. Auto-loaded when working on UI/view files.
machNotch plugin architecture rules — NotchPlugin protocol, lifecycle, DI via PluginContext, HUD event bus, PluginSettings. Auto-loaded when working in Plugins/.
mach-mono refactoring rules — file-by-file approach, dependency tier order, extract-don't-delete, build after each file, commit granularity.
Save session context before ending a conversation. Updates CLAUDE.md with learnings and creates a session summary for resuming work later.
Expert guidance on Swift Concurrency best practices, patterns, and implementation. Use when developers mention: (1) Swift Concurrency, async/await, actors, or tasks, (2) "use Swift Concurrency" or "modern concurrency patterns", (3) migrating to Swift 6, (4) data races or thread safety issues, (5) refactoring closures to async/await, (6) @MainActor, Sendable, or actor isolation, (7) concurrent code architecture or performance optimization, (8) concurrency-related linter warnings (SwiftLint or similar; e.g. async_without_await, Sendable/actor isolation/MainActor lint).