personal-projects/leo-claude-mktplace
Template
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Sprint 5] docs: git-flow branching strategy documentation #267

New Issue
Closed
opened 2026-01-28 19:16:07 +00:00 by lmiranda · 0 comments
lmiranda commented 2026-01-28 19:16:07 +00:00
Owner
Copy Link

Summary

Document the development -> staging -> main branch promotion flow for the git-flow plugin.

Implementation

Location: plugins/git-flow/docs/BRANCHING-STRATEGY.md (new file)

Content to include:

Branch Types

  • main - Production-ready releases only
  • staging - Pre-production testing (optional)
  • development - Active development, feature branches merge here
  • feat/*, fix/*, docs/*, etc. - Feature branches

Workflow Documentation

  1. Feature Development

    • Create feature branch from development
    • Naming: type/short-description (e.g., feat/user-auth)
    • PR to development when ready

  2. Release Promotion

    • development → staging (optional testing)
    • staging → main (production release)
    • Tag releases on main

  3. Hotfix Handling

    • Create from main
    • Merge to both main and development

  4. PR Requirements

    • To development: 1 approval, passing tests
    • To staging: 1 approval, all checks pass
    • To main: Protected, require PR from staging/development

Diagrams

Include Mermaid diagrams showing:

  • Branch flow
  • PR merge patterns
  • Release cycle

Acceptance Criteria

  • Create plugins/git-flow/docs/BRANCHING-STRATEGY.md
  • Include Mermaid diagrams for visual clarity
  • Update plugins/git-flow/README.md to reference new doc
  • Add link in docs/COMMANDS-CHEATSHEET.md

Wiki Reference

Implementation: Change V5.2.0 (Sprint 5)

## Summary Document the `development -> staging -> main` branch promotion flow for the git-flow plugin. ## Implementation **Location:** `plugins/git-flow/docs/BRANCHING-STRATEGY.md` (new file) **Content to include:** ### Branch Types - `main` - Production-ready releases only - `staging` - Pre-production testing (optional) - `development` - Active development, feature branches merge here - `feat/*`, `fix/*`, `docs/*`, etc. - Feature branches ### Workflow Documentation 1. **Feature Development** - Create feature branch from `development` - Naming: `type/short-description` (e.g., `feat/user-auth`) - PR to `development` when ready 2. **Release Promotion** - `development` → `staging` (optional testing) - `staging` → `main` (production release) - Tag releases on `main` 3. **Hotfix Handling** - Create from `main` - Merge to both `main` and `development` 4. **PR Requirements** - To `development`: 1 approval, passing tests - To `staging`: 1 approval, all checks pass - To `main`: Protected, require PR from staging/development ### Diagrams Include Mermaid diagrams showing: - Branch flow - PR merge patterns - Release cycle ## Acceptance Criteria - [ ] Create `plugins/git-flow/docs/BRANCHING-STRATEGY.md` - [ ] Include Mermaid diagrams for visual clarity - [ ] Update `plugins/git-flow/README.md` to reference new doc - [ ] Add link in `docs/COMMANDS-CHEATSHEET.md` ## Wiki Reference Implementation: [Change V5.2.0 (Sprint 5)](https://gitea.hotserv.cloud/personal-projects/leo-claude-mktplace/wiki/Change-V5.2.0%3A-Plugin-Enhancements-%28Sprint-5-Documentation%29)
lmiranda added this to the Sprint 5 - Documentation milestone 2026-01-28 19:19:32 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Component/API
API endpoints, contracts, and integration
 Component/Auth
Authentication and authorization
 Component/Backend
Backend service code and business logic
 Component/Database
Database schemas, migrations, queries
 Component/Deploy
Deployment, infrastructure, DevOps
 Component/Docs
Documentation and guides
 Component/Frontend
User interface and client-side code
 Component/Infra
Infrastructure and system configuration
 Component/Testing
Test infrastructure and frameworks
 Tech/Docker
Docker containers and compose
 Tech/FastAPI
FastAPI backend framework
 Tech/JavaScript
JavaScript/Node.js code
 Tech/PostgreSQL
PostgreSQL database
 Tech/Python
Python language and libraries
 Tech/Redis
Redis cache and pub/sub
 Tech/Vue
Vue.js frontend framework
Complexity/Complex
High uncertainty or many dependencies
 Complexity/Medium
Some unknowns or dependencies
 Complexity/Simple
Straightforward, well-understood
 Effort/L
3-5 days
 Effort/M
1-2 days
 Effort/S
2-4 hours
 Effort/XL
> 1 week
 Effort/XS
< 2 hours
 Priority/Critical
Immediate attention required
 Priority/High
Important, needs attention soon
 Priority/Low
Nice to have, can wait
 Priority/Medium
Normal priority
 Type/Bug
Something isn't working
 Type/Chore
Maintenance tasks
 Type/Documentation
Documentation improvements
 Type/Feature
New feature or request
 Type/Refactor
Code refactoring without changing behavior
 Type/Test
Testing related
No Label Component/Docs Complexity/Simple Effort/M Priority/Medium Type/Documentation
Milestone
No items
No Milestone Sprint 5 - Documentation
Projects
Clear projects
No project
Assignees
Clear assignees
lmiranda
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: personal-projects/leo-claude-mktplace#267
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?