2.4.1 Cicd Git Deployment

This skill defines the standard workflows for version control, continuous integration, deployment automation, and native app packaging across all projects.

1. Git Workflow & Branching Strategy

Goal: Clean, traceable history with minimal merge conflicts.

• Branch Model: Use a simplified trunk-based workflow:
  • main — production-ready code. Protected branch with required status checks.
  • dev — integration branch for active development. Merge to main via PR when stable.
  • Feature branches: feature/<short-name> branched from dev. Short-lived (< 3 days).
  • Hotfix branches: hotfix/<issue-id> branched from main. Merge back to both main and dev.
• Commit Convention: Follow Conventional Commits (feat:, fix:, chore:, docs:, refactor:, perf:, test:). Keep subject lines under 72 characters.
• PR Discipline: Every PR must have a description, link to any relevant issue, and pass all CI checks before merge. Squash-merge feature branches to keep main history clean.