git-workflow

id	SKL-git-GITWORKFLOW
name	Git Workflow
description	Git workflow encompasses practices, patterns, and strategies for using Git effectively in collaborative development environments. This skill provides comprehensive guidance on branch management, commi
version	1.0.0
status	active
owner	@cerebra-team
last_updated	2026-02-22
category	Backend
tags	["api","backend","server","database"]
stack	["Python","Node.js","REST API","GraphQL"]
difficulty	Intermediate

Git Workflow

Skill Profile

(Select at least one profile to enable specific modules)

• DevOps
• Backend
• Frontend
• AI-RAG
• Security Critical

Overview

Git workflow encompasses practices, patterns, and strategies for using Git effectively in collaborative development environments. This skill provides comprehensive guidance on branch management, commit conventions, pull request processes, merge strategies, tagging, releases, and Git configuration to maintain clean history, enable collaboration, and support reliable deployment.

Why This Matters

• Enables Collaboration: Clear workflows and conventions allow teams to work together without stepping on each other's toes
• Reduces Merge Conflicts: Proper branching and integration strategies minimize conflicts and provide clear resolution paths
• Maintains Clean History: Meaningful commits and proper merging create readable, traceable history
• Supports Reliable Releases: Semantic versioning and tagging enable predictable, controlled deployments with rollback capability
• Accelerates Onboarding: Clear commit histories and documented workflows help new team members understand project structure
• Enables Code Recovery: Proper branching and tagging allow easy identification and recovery from broken deployments

---

Core Concepts & Rules

1. Core Principles

• Follow established patterns and conventions
• Maintain consistency across codebase
• Document decisions and trade-offs

2. Implementation Guidelines

• Start with the simplest viable solution
• Iterate based on feedback and requirements
• Test thoroughly before deployment

Inputs / Outputs / Contracts

• Inputs:
  • Code changes
  • Commit messages
  • Branch names
  • Pull request descriptions
• Entry Conditions:
  • Git repository is initialized
  • Team workflow is defined
  • CI/CD is configured
• Outputs:
  • Clean commit history
  • Properly merged branches
  • Tagged releases
  • Deployed code
• Artifacts Required (Deliverables):
  • Commit messages
  • Merged pull requests
  • Release tags
  • Changelog
• Acceptance Evidence:
  • All commits follow conventions
  • Branches are properly merged
  • Releases are tagged
  • Changelog is updated
• Success Criteria:
  • Clean Git history
  • No merge conflicts
  • Proper release tags
  • Deployed code is traceable

Skill Composition

• Depends on: code-review
• Compatible with: api-design, technical-debt-management
• Conflicts with: None
• Related Skills: refactoring-strategies, python-standards, typescript-standards

---

Quick Start / Implementation Example

1. Review requirements and constraints
2. Set up development environment
3. Implement core functionality following patterns
4. Write tests for critical paths
5. Run tests and fix issues
6. Document any deviations or decisions

# Example implementation following best practices
def example_function():
    # Your implementation here
    pass

Assumptions / Constraints / Non-goals

• Assumptions:
  • Development environment is properly configured
  • Required dependencies are available
  • Team has basic understanding of domain
• Constraints:
  • Must follow existing codebase conventions
  • Time and resource limitations
  • Compatibility requirements
• Non-goals:
  • This skill does not cover edge cases outside scope
  • Not a replacement for formal training

Compatibility & Prerequisites

• Supported Versions:
  • Python 3.8+
  • Node.js 16+
  • Modern browsers (Chrome, Firefox, Safari, Edge)
• Required AI Tools:
  • Code editor (VS Code recommended)
  • Testing framework appropriate for language
  • Version control (Git)
• Dependencies:
  • Language-specific package manager
  • Build tools
  • Testing libraries
• Environment Setup:
  • .env.example keys: API_KEY, DATABASE_URL (no values)

Test Scenario Matrix (QA Strategy)

Type	Focus Area	Required Scenarios / Mocks
Unit	Core Logic	Must cover primary logic and at least 3 edge/error cases. Target minimum 80% coverage
Integration	DB / API	All external API calls or database connections must be mocked during unit tests
E2E	User Journey	Critical user flows to test
Performance	Latency / Load	Benchmark requirements
Security	Vuln / Auth	SAST/DAST or dependency audit
Frontend	UX / A11y	Accessibility checklist (WCAG), Performance Budget (Lighthouse score)

Technical Guardrails & Security Threat Model

1. Security & Privacy (Threat Model)

• Top Threats: Injection attacks, authentication bypass, data exposure

• Data Handling: Sanitize all user inputs to prevent Injection attacks. Never log raw PII
• Secrets Management: No hardcoded API keys. Use Env Vars/Secrets Manager
• Authorization: Validate user permissions before state changes

2. Performance & Resources

• Execution Efficiency: Consider time complexity for algorithms
• Memory Management: Use streams/pagination for large data
• Resource Cleanup: Close DB connections/file handlers in finally blocks

3. Architecture & Scalability

• Design Pattern: Follow SOLID principles, use Dependency Injection
• Modularity: Decouple logic from UI/Frameworks

4. Observability & Reliability

• Logging Standards: Structured JSON, include trace IDs request_id
• Metrics: Track error_rate, latency, queue_depth
• Error Handling: Standardized error codes, no bare except
• Observability Artifacts:
  • Log Fields: timestamp, level, message, request_id
  • Metrics: request_count, error_count, response_time
  • Dashboards/Alerts: High Error Rate > 5%

Agent Directives & Error Recovery

(ข้อกำหนดสำหรับ AI Agent ในการคิดและแก้ปัญหาเมื่อเกิดข้อผิดพลาด)

• Thinking Process: Analyze root cause before fixing. Do not brute-force.
• Fallback Strategy: Stop after 3 failed test attempts. Output root cause and ask for human intervention/clarification.
• Self-Review: Check against Guardrails & Anti-patterns before finalizing.
• Output Constraints: Output ONLY the modified code block. Do not explain unless asked.

Definition of Done (DoD) Checklist

• Tests passed + coverage met
• Lint/Typecheck passed
• Logging/Metrics/Trace implemented
• Security checks passed
• Documentation/Changelog updated
• Accessibility/Performance requirements met (if frontend)

Anti-patterns / Pitfalls

• ⛔ Don't: Log PII, catch-all exception, N+1 queries
• ⚠️ Watch out for: Common symptoms and quick fixes
• 💡 Instead: Use proper error handling, pagination, and logging

Reference Links & Examples

• Internal documentation and examples
• Official documentation and best practices
• Community resources and discussions

Versioning & Changelog

• Version: 1.0.0
• Changelog:
  • 2026-02-22: Initial version with complete template structure