universal-dev-standards 4.2.0 → 5.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/bin/uds.js +165 -5
- package/bundled/core/acceptance-test-driven-development.md +19 -721
- package/bundled/core/accessibility-standards.md +862 -0
- package/bundled/core/ai-agreement-standards.md +95 -0
- package/bundled/core/ai-friendly-architecture.md +2 -0
- package/bundled/core/ai-instruction-standards.md +2 -0
- package/bundled/core/anti-hallucination.md +90 -637
- package/bundled/core/behavior-driven-development.md +20 -735
- package/bundled/core/changelog-standards.md +4 -0
- package/bundled/core/checkin-standards.md +21 -4
- package/bundled/core/code-review-checklist.md +3 -0
- package/bundled/core/commit-message-guide.md +14 -3
- package/bundled/core/deployment-standards.md +296 -0
- package/bundled/core/developer-memory.md +568 -0
- package/bundled/core/documentation-structure.md +114 -18
- package/bundled/core/documentation-writing-standards.md +272 -2
- package/bundled/core/error-code-standards.md +3 -0
- package/bundled/core/forward-derivation-standards.md +134 -8
- package/bundled/core/git-workflow.md +72 -686
- package/bundled/core/guides/anti-hallucination-guide.md +517 -0
- package/bundled/core/guides/git-workflow-guide.md +954 -0
- package/bundled/core/guides/performance-guide.md +508 -0
- package/bundled/core/guides/refactoring-guide.md +608 -0
- package/bundled/core/guides/security-guide.md +485 -0
- package/bundled/core/logging-standards.md +337 -2
- package/bundled/core/performance-standards.md +231 -0
- package/bundled/core/project-context-memory.md +180 -0
- package/bundled/core/project-structure.md +315 -2
- package/bundled/core/refactoring-standards.md +81 -761
- package/bundled/core/requirement-engineering.md +39 -0
- package/bundled/core/reverse-engineering-standards.md +6 -4
- package/bundled/core/security-standards.md +244 -0
- package/bundled/core/spec-driven-development.md +20 -319
- package/bundled/core/test-completeness-dimensions.md +213 -11
- package/bundled/core/test-driven-development.md +22 -978
- package/bundled/core/testing-standards.md +222 -2903
- package/bundled/core/versioning.md +16 -55
- package/bundled/core/virtual-organization-standards.md +85 -0
- package/bundled/locales/README.md +4 -4
- package/bundled/locales/zh-CN/CHANGELOG.md +18 -18
- package/bundled/locales/zh-CN/CLAUDE.md +3 -3
- package/bundled/locales/zh-CN/MAINTENANCE.md +7 -7
- package/bundled/locales/zh-CN/README.md +2 -2
- package/bundled/locales/zh-CN/STANDARDS-MAPPING.md +1 -1
- package/bundled/locales/zh-CN/adoption/ADOPTION-GUIDE.md +3 -3
- package/bundled/locales/zh-CN/adoption/DAILY-WORKFLOW-GUIDE.md +66 -7
- package/bundled/locales/zh-CN/adoption/STATIC-DYNAMIC-GUIDE.md +22 -22
- package/bundled/locales/zh-CN/adoption/checklists/enterprise.md +5 -5
- package/bundled/locales/zh-CN/adoption/checklists/minimal.md +4 -4
- package/bundled/locales/zh-CN/adoption/checklists/recommended.md +5 -5
- package/bundled/locales/zh-CN/ai/MAINTENANCE.md +13 -13
- package/bundled/locales/zh-CN/core/ai-instruction-standards.md +1 -1
- package/bundled/locales/zh-CN/core/anti-hallucination.md +39 -3
- package/bundled/locales/zh-CN/core/checkin-standards.md +18 -5
- package/bundled/locales/zh-CN/core/commit-message-guide.md +1 -1
- package/bundled/locales/zh-CN/core/developer-memory.md +576 -0
- package/bundled/locales/zh-CN/core/documentation-structure.md +43 -5
- package/bundled/locales/zh-CN/core/documentation-writing-standards.md +146 -5
- package/bundled/locales/zh-CN/core/git-workflow.md +179 -4
- package/bundled/locales/zh-CN/core/logging-standards.md +177 -4
- package/bundled/locales/zh-CN/core/project-structure.md +117 -5
- package/bundled/locales/zh-CN/core/refactoring-standards.md +3 -3
- package/bundled/locales/zh-CN/core/reverse-engineering-standards.md +6 -6
- package/bundled/locales/zh-CN/core/spec-driven-development.md +516 -14
- package/bundled/locales/zh-CN/core/test-completeness-dimensions.md +155 -24
- package/bundled/locales/zh-CN/core/test-driven-development.md +71 -20
- package/bundled/locales/zh-CN/core/testing-standards.md +4 -4
- package/bundled/locales/zh-CN/core/versioning.md +1 -1
- package/bundled/locales/zh-CN/docs/AI-AGENT-ROADMAP.md +90 -51
- package/bundled/locales/zh-CN/docs/CHEATSHEET.md +184 -0
- package/bundled/locales/zh-CN/docs/CLI-FLOW.md +239 -0
- package/bundled/locales/zh-CN/docs/FEATURE-REFERENCE.md +320 -0
- package/bundled/locales/zh-CN/docs/OPERATION-WORKFLOW.md +43 -43
- package/bundled/locales/zh-CN/docs/STANDARDS-REFERENCE.md +440 -0
- package/bundled/locales/zh-CN/docs/USAGE-MODES-COMPARISON.md +1 -1
- package/bundled/locales/zh-CN/docs/WINDOWS-GUIDE.md +1 -1
- package/bundled/locales/zh-CN/integrations/codex/README.md +3 -3
- package/bundled/locales/zh-CN/integrations/gemini-cli/README.md +3 -3
- package/bundled/locales/zh-CN/integrations/github-copilot/README.md +5 -5
- package/bundled/locales/zh-CN/integrations/github-copilot/copilot-instructions.md +9 -9
- package/bundled/locales/zh-CN/integrations/github-copilot/skills-mapping.md +18 -6
- package/bundled/locales/zh-CN/integrations/google-antigravity/README.md +2 -2
- package/bundled/locales/zh-CN/integrations/opencode/README.md +3 -3
- package/bundled/locales/zh-CN/integrations/opencode/skills-mapping.md +22 -10
- package/bundled/locales/zh-CN/integrations/openspec/README.md +1 -1
- package/bundled/locales/zh-CN/integrations/spec-kit/AGENTS.md +3 -3
- package/bundled/locales/zh-CN/integrations/spec-kit/README.md +1 -1
- package/bundled/locales/zh-CN/options/commit-message/bilingual.md +1 -1
- package/bundled/locales/zh-CN/options/commit-message/english.md +1 -1
- package/bundled/locales/zh-CN/options/commit-message/traditional-chinese.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/gitflow.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/github-flow.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/merge-commit.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/rebase-ff.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/squash-merge.md +1 -1
- package/bundled/locales/zh-CN/options/git-workflow/trunk-based.md +1 -1
- package/bundled/locales/zh-CN/options/project-structure/dotnet.md +1 -1
- package/bundled/locales/zh-CN/options/project-structure/go.md +1 -1
- package/bundled/locales/zh-CN/options/project-structure/java.md +1 -1
- package/bundled/locales/zh-CN/options/project-structure/nodejs.md +1 -1
- package/bundled/locales/zh-CN/options/project-structure/python.md +1 -1
- package/bundled/locales/zh-CN/options/testing/e2e-testing.md +1 -1
- package/bundled/locales/zh-CN/options/testing/integration-testing.md +1 -1
- package/bundled/locales/zh-CN/options/testing/system-testing.md +1 -1
- package/bundled/locales/zh-CN/options/testing/unit-testing.md +1 -1
- package/bundled/locales/zh-CN/skills/{claude-code/CONTRIBUTING.template.md → CONTRIBUTING.template.md} +2 -2
- package/bundled/locales/zh-CN/skills/README.md +131 -81
- package/bundled/locales/zh-CN/skills/agents/README.md +281 -0
- package/bundled/locales/zh-CN/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/SKILL.md +10 -10
- package/bundled/locales/zh-CN/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/anti-hallucination.md +8 -8
- package/bundled/locales/zh-CN/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/certainty-labels.md +8 -8
- package/bundled/locales/zh-CN/skills/ai-friendly-architecture/SKILL.md +221 -0
- package/bundled/locales/zh-CN/skills/ai-instruction-standards/SKILL.md +214 -0
- package/bundled/locales/zh-CN/skills/atdd-assistant/SKILL.md +71 -0
- package/bundled/locales/zh-CN/skills/atdd-assistant/acceptance-criteria-guide.md +428 -0
- package/bundled/locales/zh-CN/skills/atdd-assistant/atdd-workflow.md +484 -0
- package/bundled/locales/zh-CN/skills/atdd-assistant/guide.md +368 -0
- package/bundled/locales/zh-CN/skills/bdd-assistant/SKILL.md +68 -0
- package/bundled/locales/zh-CN/skills/bdd-assistant/bdd-workflow.md +406 -0
- package/bundled/locales/zh-CN/skills/bdd-assistant/gherkin-guide.md +454 -0
- package/bundled/locales/zh-CN/skills/bdd-assistant/guide.md +324 -0
- package/bundled/locales/zh-CN/skills/changelog-guide/SKILL.md +64 -0
- package/bundled/locales/zh-CN/skills/{claude-code/changelog-guide/SKILL.md → changelog-guide/guide.md} +6 -7
- package/bundled/locales/zh-CN/skills/checkin-assistant/SKILL.md +56 -0
- package/bundled/locales/zh-CN/skills/{claude-code/checkin-assistant/SKILL.md → checkin-assistant/guide.md} +6 -7
- package/bundled/locales/zh-CN/skills/code-review-assistant/SKILL.md +56 -0
- package/bundled/locales/zh-CN/skills/{claude-code/code-review-assistant → code-review-assistant}/checkin-checklist.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/code-review-assistant/SKILL.md → code-review-assistant/guide.md} +5 -6
- package/bundled/locales/zh-CN/skills/{claude-code/code-review-assistant → code-review-assistant}/review-checklist.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/commands → commands}/bdd.md +2 -2
- package/bundled/locales/zh-CN/skills/{claude-code/commands → commands}/methodology.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/commands → commands}/refactor.md +3 -3
- package/bundled/locales/zh-CN/skills/commit-standards/SKILL.md +61 -0
- package/bundled/locales/zh-CN/skills/{claude-code/commit-standards → commit-standards}/conventional-commits.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/commit-standards/SKILL.md → commit-standards/guide.md} +5 -6
- package/bundled/locales/zh-CN/skills/{claude-code/commit-standards → commit-standards}/language-options.md +3 -3
- package/bundled/locales/zh-CN/skills/docs-generator/SKILL.md +59 -0
- package/bundled/locales/zh-CN/skills/docs-generator/guide.md +262 -0
- package/bundled/locales/zh-CN/skills/{claude-code/documentation-guide → documentation-guide}/SKILL.md +7 -8
- package/bundled/locales/zh-CN/skills/{claude-code/documentation-guide → documentation-guide}/documentation-structure.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/documentation-guide → documentation-guide}/readme-template.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/error-code-guide → error-code-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-CN/skills/forward-derivation/SKILL.md +62 -0
- package/bundled/locales/zh-CN/skills/forward-derivation/guide.md +130 -0
- package/bundled/locales/zh-CN/skills/{claude-code/git-workflow-guide → git-workflow-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-CN/skills/{claude-code/git-workflow-guide → git-workflow-guide}/branch-naming.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/git-workflow-guide → git-workflow-guide}/git-workflow.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/logging-guide → logging-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-CN/skills/methodology-system/SKILL.md +78 -0
- package/bundled/locales/zh-CN/skills/{claude-code/methodology-system → methodology-system}/create-methodology.md +2 -2
- package/bundled/locales/zh-CN/skills/{claude-code/methodology-system/SKILL.md → methodology-system/guide.md} +2 -2
- package/bundled/locales/zh-CN/skills/{claude-code/methodology-system → methodology-system}/runtime.md +3 -3
- package/bundled/locales/zh-CN/skills/project-discovery/SKILL.md +66 -0
- package/bundled/locales/zh-CN/skills/project-discovery/guide.md +371 -0
- package/bundled/locales/zh-CN/skills/{claude-code/project-structure-guide → project-structure-guide}/SKILL.md +4 -4
- package/bundled/locales/zh-CN/skills/{claude-code/project-structure-guide → project-structure-guide}/language-patterns.md +1 -1
- package/bundled/locales/zh-CN/skills/refactoring-assistant/SKILL.md +67 -0
- package/bundled/locales/zh-CN/skills/{claude-code/refactoring-assistant/SKILL.md → refactoring-assistant/guide.md} +7 -8
- package/bundled/locales/zh-CN/skills/release-standards/SKILL.md +64 -0
- package/bundled/locales/zh-CN/skills/{claude-code/release-standards → release-standards}/changelog-format.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/release-standards/SKILL.md → release-standards/guide.md} +5 -6
- package/bundled/locales/zh-CN/skills/{claude-code/release-standards → release-standards}/release-workflow.md +7 -7
- package/bundled/locales/zh-CN/skills/{claude-code/release-standards → release-standards}/semantic-versioning.md +3 -3
- package/bundled/locales/zh-CN/skills/requirement-assistant/SKILL.md +67 -0
- package/bundled/locales/zh-CN/skills/{claude-code/requirement-assistant/SKILL.md → requirement-assistant/guide.md} +4 -5
- package/bundled/locales/zh-CN/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-checklist.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-writing.md +3 -3
- package/bundled/locales/zh-CN/skills/reverse-engineer/SKILL.md +67 -0
- package/bundled/locales/zh-CN/skills/{claude-code/reverse-engineer → reverse-engineer}/bdd-extraction.md +2 -2
- package/bundled/locales/zh-CN/skills/{claude-code/reverse-engineer/SKILL.md → reverse-engineer/guide.md} +17 -18
- package/bundled/locales/zh-CN/skills/{claude-code/reverse-engineer → reverse-engineer}/tdd-analysis.md +2 -2
- package/bundled/locales/zh-CN/skills/{claude-code/reverse-engineer → reverse-engineer}/workflow.md +3 -3
- package/bundled/locales/zh-CN/skills/spec-driven-dev/SKILL.md +75 -0
- package/bundled/locales/zh-CN/skills/{claude-code/spec-driven-dev/SKILL.md → spec-driven-dev/guide.md} +10 -11
- package/bundled/locales/zh-CN/skills/tdd-assistant/SKILL.md +66 -0
- package/bundled/locales/zh-CN/skills/{claude-code/tdd-assistant/SKILL.md → tdd-assistant/guide.md} +12 -16
- package/bundled/locales/zh-CN/skills/{claude-code/tdd-assistant → tdd-assistant}/language-examples.md +3 -3
- package/bundled/locales/zh-CN/skills/{claude-code/tdd-assistant → tdd-assistant}/tdd-workflow.md +3 -3
- package/bundled/locales/zh-CN/skills/test-coverage-assistant/SKILL.md +65 -0
- package/bundled/locales/zh-CN/skills/test-coverage-assistant/guide.md +284 -0
- package/bundled/locales/zh-CN/skills/{claude-code/testing-guide → testing-guide}/SKILL.md +8 -8
- package/bundled/locales/zh-CN/skills/{claude-code/testing-guide → testing-guide}/testing-pyramid.md +4 -4
- package/bundled/locales/zh-CN/skills/{cline → tools/cline}/README.md +1 -1
- package/bundled/locales/zh-CN/skills/{copilot → tools/copilot}/README.md +1 -1
- package/bundled/locales/zh-CN/skills/{copilot → tools/copilot}/copilot-instructions.md +1 -1
- package/bundled/locales/zh-CN/skills/{cursor → tools/cursor}/README.md +1 -1
- package/bundled/locales/zh-CN/skills/{windsurf → tools/windsurf}/README.md +1 -1
- package/bundled/locales/zh-TW/CHANGELOG.md +16 -16
- package/bundled/locales/zh-TW/CLAUDE.md +3 -3
- package/bundled/locales/zh-TW/MAINTENANCE.md +7 -7
- package/bundled/locales/zh-TW/README.md +13 -7
- package/bundled/locales/zh-TW/STANDARDS-MAPPING.md +1 -1
- package/bundled/locales/zh-TW/adoption/ADOPTION-GUIDE.md +4 -4
- package/bundled/locales/zh-TW/adoption/DAILY-WORKFLOW-GUIDE.md +66 -7
- package/bundled/locales/zh-TW/adoption/STATIC-DYNAMIC-GUIDE.md +22 -22
- package/bundled/locales/zh-TW/adoption/checklists/enterprise.md +5 -5
- package/bundled/locales/zh-TW/adoption/checklists/minimal.md +4 -4
- package/bundled/locales/zh-TW/adoption/checklists/recommended.md +5 -5
- package/bundled/locales/zh-TW/ai/MAINTENANCE.md +13 -13
- package/bundled/locales/zh-TW/ai/standards/anti-hallucination.ai.yaml +3 -2
- package/bundled/locales/zh-TW/ai/standards/git-workflow.ai.yaml +4 -3
- package/bundled/locales/zh-TW/ai/standards/spec-driven-development.ai.yaml +3 -3
- package/bundled/locales/zh-TW/ai/standards/testing.ai.yaml +1 -0
- package/bundled/locales/zh-TW/core/ai-instruction-standards.md +1 -1
- package/bundled/locales/zh-TW/core/anti-hallucination.md +38 -701
- package/bundled/locales/zh-TW/core/changelog-standards.md +1 -1
- package/bundled/locales/zh-TW/core/checkin-standards.md +18 -5
- package/bundled/locales/zh-TW/core/code-review-checklist.md +1 -1
- package/bundled/locales/zh-TW/core/commit-message-guide.md +1 -1
- package/bundled/locales/zh-TW/core/developer-memory.md +576 -0
- package/bundled/locales/zh-TW/core/documentation-structure.md +115 -22
- package/bundled/locales/zh-TW/core/documentation-writing-standards.md +126 -5
- package/bundled/locales/zh-TW/core/forward-derivation-standards.md +2 -2
- package/bundled/locales/zh-TW/core/git-workflow.md +38 -812
- package/bundled/locales/zh-TW/core/guides/anti-hallucination-guide.md +779 -0
- package/bundled/locales/zh-TW/core/guides/git-workflow-guide.md +1016 -0
- package/bundled/locales/zh-TW/core/guides/refactoring-guide.md +864 -0
- package/bundled/locales/zh-TW/core/guides/testing-guide.md +2280 -0
- package/bundled/locales/zh-TW/core/logging-standards.md +159 -4
- package/bundled/locales/zh-TW/core/project-structure.md +102 -9
- package/bundled/locales/zh-TW/core/refactoring-standards.md +37 -823
- package/bundled/locales/zh-TW/core/reverse-engineering-standards.md +6 -6
- package/bundled/locales/zh-TW/core/spec-driven-development.md +17 -268
- package/bundled/locales/zh-TW/core/test-completeness-dimensions.md +128 -14
- package/bundled/locales/zh-TW/core/test-driven-development.md +20 -983
- package/bundled/locales/zh-TW/core/testing-standards.md +120 -2105
- package/bundled/locales/zh-TW/core/versioning.md +13 -55
- package/bundled/locales/zh-TW/docs/AI-AGENT-ROADMAP.md +90 -51
- package/bundled/locales/zh-TW/docs/CHEATSHEET.md +184 -0
- package/bundled/locales/zh-TW/docs/CLI-FLOW.md +239 -0
- package/bundled/locales/zh-TW/docs/FEATURE-REFERENCE.md +320 -0
- package/bundled/locales/zh-TW/docs/MIGRATION-V5.md +71 -0
- package/bundled/locales/zh-TW/docs/OPERATION-WORKFLOW.md +42 -42
- package/bundled/locales/zh-TW/docs/STANDARDS-REFERENCE.md +440 -0
- package/bundled/locales/zh-TW/docs/USAGE-MODES-COMPARISON.md +1 -1
- package/bundled/locales/zh-TW/docs/WINDOWS-GUIDE.md +1 -1
- package/bundled/locales/zh-TW/integrations/claude-code/README.md +44 -0
- package/bundled/locales/zh-TW/integrations/github-copilot/copilot-instructions.md +3 -3
- package/bundled/locales/zh-TW/integrations/github-copilot/skills-mapping.md +18 -6
- package/bundled/locales/zh-TW/integrations/opencode/skills-mapping.md +22 -10
- package/bundled/locales/zh-TW/methodologies/guides/sdd-guide.md +338 -0
- package/bundled/locales/zh-TW/methodologies/guides/tdd-guide.md +1055 -0
- package/bundled/locales/zh-TW/options/commit-message/bilingual.md +1 -1
- package/bundled/locales/zh-TW/options/commit-message/english.md +1 -1
- package/bundled/locales/zh-TW/options/commit-message/traditional-chinese.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/gitflow.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/github-flow.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/merge-commit.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/rebase-ff.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/squash-merge.md +1 -1
- package/bundled/locales/zh-TW/options/git-workflow/trunk-based.md +1 -1
- package/bundled/locales/zh-TW/options/project-structure/dotnet.md +1 -1
- package/bundled/locales/zh-TW/options/project-structure/go.md +1 -1
- package/bundled/locales/zh-TW/options/project-structure/java.md +1 -1
- package/bundled/locales/zh-TW/options/project-structure/nodejs.md +1 -1
- package/bundled/locales/zh-TW/options/project-structure/python.md +1 -1
- package/bundled/locales/zh-TW/options/testing/e2e-testing.md +1 -1
- package/bundled/locales/zh-TW/options/testing/integration-testing.md +1 -1
- package/bundled/locales/zh-TW/options/testing/system-testing.md +1 -1
- package/bundled/locales/zh-TW/options/testing/unit-testing.md +1 -1
- package/bundled/locales/zh-TW/skills/{claude-code/CONTRIBUTING.template.md → CONTRIBUTING.template.md} +2 -2
- package/bundled/locales/zh-TW/skills/README.md +131 -79
- package/bundled/locales/zh-TW/skills/agents/README.md +281 -0
- package/bundled/locales/zh-TW/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/SKILL.md +7 -7
- package/bundled/locales/zh-TW/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/anti-hallucination.md +8 -8
- package/bundled/locales/zh-TW/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/certainty-labels.md +8 -8
- package/bundled/locales/zh-TW/skills/ai-friendly-architecture/SKILL.md +221 -0
- package/bundled/locales/zh-TW/skills/ai-instruction-standards/SKILL.md +214 -0
- package/bundled/locales/zh-TW/skills/atdd-assistant/SKILL.md +71 -0
- package/bundled/locales/zh-TW/skills/atdd-assistant/acceptance-criteria-guide.md +428 -0
- package/bundled/locales/zh-TW/skills/atdd-assistant/atdd-workflow.md +484 -0
- package/bundled/locales/zh-TW/skills/atdd-assistant/guide.md +368 -0
- package/bundled/locales/zh-TW/skills/bdd-assistant/SKILL.md +68 -0
- package/bundled/locales/zh-TW/skills/bdd-assistant/bdd-workflow.md +406 -0
- package/bundled/locales/zh-TW/skills/bdd-assistant/gherkin-guide.md +454 -0
- package/bundled/locales/zh-TW/skills/bdd-assistant/guide.md +324 -0
- package/bundled/locales/zh-TW/skills/changelog-guide/SKILL.md +64 -0
- package/bundled/locales/zh-TW/skills/{claude-code/changelog-guide/SKILL.md → changelog-guide/guide.md} +6 -7
- package/bundled/locales/zh-TW/skills/checkin-assistant/SKILL.md +56 -0
- package/bundled/locales/zh-TW/skills/{claude-code/checkin-assistant/SKILL.md → checkin-assistant/guide.md} +6 -7
- package/bundled/locales/zh-TW/skills/code-review-assistant/SKILL.md +56 -0
- package/bundled/locales/zh-TW/skills/{claude-code/code-review-assistant → code-review-assistant}/checkin-checklist.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/code-review-assistant/SKILL.md → code-review-assistant/guide.md} +2 -3
- package/bundled/locales/zh-TW/skills/{claude-code/code-review-assistant → code-review-assistant}/review-checklist.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/commands → commands}/bdd.md +2 -2
- package/bundled/locales/zh-TW/skills/{claude-code/commands → commands}/methodology.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/commands → commands}/refactor.md +3 -3
- package/bundled/locales/zh-TW/skills/commit-standards/SKILL.md +61 -0
- package/bundled/locales/zh-TW/skills/{claude-code/commit-standards → commit-standards}/conventional-commits.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/commit-standards/SKILL.md → commit-standards/guide.md} +5 -6
- package/bundled/locales/zh-TW/skills/{claude-code/commit-standards → commit-standards}/language-options.md +3 -3
- package/bundled/locales/zh-TW/skills/docs-generator/SKILL.md +59 -0
- package/bundled/locales/zh-TW/skills/docs-generator/guide.md +262 -0
- package/bundled/locales/zh-TW/skills/{claude-code/documentation-guide → documentation-guide}/SKILL.md +7 -8
- package/bundled/locales/zh-TW/skills/{claude-code/documentation-guide → documentation-guide}/documentation-structure.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/documentation-guide → documentation-guide}/readme-template.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/error-code-guide → error-code-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-TW/skills/forward-derivation/SKILL.md +62 -0
- package/bundled/locales/zh-TW/skills/{claude-code/forward-derivation/SKILL.md → forward-derivation/guide.md} +24 -19
- package/bundled/locales/zh-TW/skills/{claude-code/git-workflow-guide → git-workflow-guide}/SKILL.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/git-workflow-guide → git-workflow-guide}/branch-naming.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/git-workflow-guide → git-workflow-guide}/git-workflow.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/logging-guide → logging-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-TW/skills/methodology-system/SKILL.md +78 -0
- package/bundled/locales/zh-TW/skills/{claude-code/methodology-system → methodology-system}/create-methodology.md +2 -2
- package/bundled/locales/zh-TW/skills/{claude-code/methodology-system/SKILL.md → methodology-system/guide.md} +2 -2
- package/bundled/locales/zh-TW/skills/{claude-code/methodology-system → methodology-system}/runtime.md +3 -3
- package/bundled/locales/zh-TW/skills/project-discovery/SKILL.md +66 -0
- package/bundled/locales/zh-TW/skills/project-discovery/guide.md +371 -0
- package/bundled/locales/zh-TW/skills/project-discovery/workflow.md +574 -0
- package/bundled/locales/zh-TW/skills/{claude-code/project-structure-guide → project-structure-guide}/SKILL.md +4 -4
- package/bundled/locales/zh-TW/skills/{claude-code/project-structure-guide → project-structure-guide}/language-patterns.md +1 -1
- package/bundled/locales/zh-TW/skills/refactoring-assistant/SKILL.md +67 -0
- package/bundled/locales/zh-TW/skills/{claude-code/refactoring-assistant/SKILL.md → refactoring-assistant/guide.md} +7 -8
- package/bundled/locales/zh-TW/skills/release-standards/SKILL.md +64 -0
- package/bundled/locales/zh-TW/skills/{claude-code/release-standards → release-standards}/changelog-format.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/release-standards/SKILL.md → release-standards/guide.md} +2 -3
- package/bundled/locales/zh-TW/skills/{claude-code/release-standards → release-standards}/release-workflow.md +60 -28
- package/bundled/locales/zh-TW/skills/{claude-code/release-standards → release-standards}/semantic-versioning.md +3 -3
- package/bundled/locales/zh-TW/skills/requirement-assistant/SKILL.md +67 -0
- package/bundled/locales/zh-TW/skills/{claude-code/requirement-assistant/SKILL.md → requirement-assistant/guide.md} +2 -3
- package/bundled/locales/zh-TW/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-checklist.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-writing.md +3 -3
- package/bundled/locales/zh-TW/skills/reverse-engineer/SKILL.md +67 -0
- package/bundled/locales/zh-TW/skills/{claude-code/reverse-engineer → reverse-engineer}/bdd-extraction.md +2 -2
- package/bundled/locales/zh-TW/skills/{claude-code/reverse-engineer/SKILL.md → reverse-engineer/guide.md} +17 -18
- package/bundled/locales/zh-TW/skills/{claude-code/reverse-engineer → reverse-engineer}/tdd-analysis.md +2 -2
- package/bundled/locales/zh-TW/skills/{claude-code/reverse-engineer → reverse-engineer}/workflow.md +3 -3
- package/bundled/locales/zh-TW/skills/spec-driven-dev/SKILL.md +75 -0
- package/bundled/locales/zh-TW/skills/{claude-code/spec-driven-dev/SKILL.md → spec-driven-dev/guide.md} +9 -10
- package/bundled/locales/zh-TW/skills/tdd-assistant/SKILL.md +66 -0
- package/bundled/locales/zh-TW/skills/{claude-code/tdd-assistant/SKILL.md → tdd-assistant/guide.md} +9 -10
- package/bundled/locales/zh-TW/skills/{claude-code/tdd-assistant → tdd-assistant}/language-examples.md +3 -3
- package/bundled/locales/zh-TW/skills/{claude-code/tdd-assistant → tdd-assistant}/tdd-workflow.md +3 -3
- package/bundled/locales/zh-TW/skills/test-coverage-assistant/SKILL.md +65 -0
- package/bundled/locales/zh-TW/skills/{claude-code/test-coverage-assistant/SKILL.md → test-coverage-assistant/guide.md} +27 -24
- package/bundled/locales/zh-TW/skills/{claude-code/testing-guide → testing-guide}/SKILL.md +6 -6
- package/bundled/locales/zh-TW/skills/{claude-code/testing-guide → testing-guide}/testing-pyramid.md +4 -4
- package/bundled/locales/zh-TW/skills/{cline → tools/cline}/README.md +1 -1
- package/bundled/locales/zh-TW/skills/{copilot → tools/copilot}/README.md +1 -1
- package/bundled/locales/zh-TW/skills/{copilot → tools/copilot}/copilot-instructions.md +1 -1
- package/bundled/locales/zh-TW/skills/{cursor → tools/cursor}/README.md +1 -1
- package/bundled/locales/zh-TW/skills/{windsurf → tools/windsurf}/README.md +1 -1
- package/bundled/skills/INTEGRATION-GUIDE.md +210 -0
- package/bundled/skills/README.md +95 -0
- package/bundled/skills/_shared/README.md +60 -0
- package/bundled/skills/{claude-code/agents → agents}/README.md +2 -2
- package/bundled/skills/{claude-code/agents → agents}/code-architect.md +1 -1
- package/bundled/skills/{claude-code/agents → agents}/doc-writer.md +1 -1
- package/bundled/skills/{claude-code/agents → agents}/reviewer.md +1 -1
- package/bundled/skills/{claude-code/agents → agents}/spec-analyst.md +1 -1
- package/bundled/skills/{claude-code/agents → agents}/test-specialist.md +1 -1
- package/bundled/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/SKILL.md +28 -5
- package/bundled/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/anti-hallucination.md +24 -5
- package/bundled/skills/{claude-code/ai-collaboration-standards → ai-collaboration-standards}/certainty-labels.md +31 -6
- package/bundled/skills/ai-friendly-architecture/SKILL.md +216 -0
- package/bundled/skills/ai-instruction-standards/SKILL.md +209 -0
- package/bundled/skills/atdd-assistant/SKILL.md +74 -0
- package/bundled/skills/{claude-code/atdd-assistant → atdd-assistant}/acceptance-criteria-guide.md +1 -1
- package/bundled/skills/{claude-code/atdd-assistant → atdd-assistant}/atdd-workflow.md +1 -1
- package/bundled/skills/{claude-code/atdd-assistant/SKILL.md → atdd-assistant/guide.md} +11 -11
- package/bundled/skills/bdd-assistant/SKILL.md +70 -0
- package/bundled/skills/{claude-code/bdd-assistant → bdd-assistant}/bdd-workflow.md +1 -1
- package/bundled/skills/{claude-code/bdd-assistant → bdd-assistant}/gherkin-guide.md +1 -1
- package/bundled/skills/{claude-code/bdd-assistant/SKILL.md → bdd-assistant/guide.md} +11 -11
- package/bundled/skills/changelog-guide/SKILL.md +66 -0
- package/bundled/skills/{claude-code/changelog-guide/SKILL.md → changelog-guide/guide.md} +8 -6
- package/bundled/skills/checkin-assistant/SKILL.md +52 -0
- package/bundled/skills/{claude-code/checkin-assistant/SKILL.md → checkin-assistant/guide.md} +6 -6
- package/bundled/skills/code-review-assistant/SKILL.md +53 -0
- package/bundled/skills/{claude-code/code-review-assistant → code-review-assistant}/checkin-checklist.md +3 -3
- package/bundled/skills/{claude-code/code-review-assistant/SKILL.md → code-review-assistant/guide.md} +7 -5
- package/bundled/skills/{claude-code/code-review-assistant → code-review-assistant}/review-checklist.md +3 -3
- package/bundled/skills/commands/COMMAND-FAMILY-OVERVIEW.md +290 -0
- package/bundled/skills/{claude-code/commands → commands}/README.md +13 -3
- package/bundled/skills/{claude-code/commands → commands}/atdd.md +3 -3
- package/bundled/skills/{claude-code/commands → commands}/bdd.md +2 -2
- package/bundled/skills/commands/changelog.md +58 -0
- package/bundled/skills/{claude-code/commands → commands}/check.md +1 -1
- package/bundled/skills/commands/checkin.md +53 -0
- package/bundled/skills/{claude-code/commands → commands}/commit.md +3 -3
- package/bundled/skills/{claude-code/commands → commands}/config.md +1 -1
- package/bundled/skills/{claude-code/commands → commands}/coverage.md +5 -4
- package/bundled/skills/commands/derive-all.md +53 -0
- package/bundled/skills/commands/derive-atdd.md +49 -0
- package/bundled/skills/commands/derive-bdd.md +47 -0
- package/bundled/skills/commands/derive-tdd.md +48 -0
- package/bundled/skills/commands/derive.md +72 -0
- package/bundled/skills/commands/discover.md +80 -0
- package/bundled/skills/commands/docgen.md +61 -0
- package/bundled/skills/commands/docs.md +59 -0
- package/bundled/skills/commands/guide.md +44 -0
- package/bundled/skills/{claude-code/commands → commands}/init.md +2 -2
- package/bundled/skills/{claude-code/commands → commands}/methodology.md +32 -16
- package/bundled/skills/{claude-code/commands → commands}/refactor.md +2 -2
- package/bundled/skills/commands/release.md +56 -0
- package/bundled/skills/{claude-code/commands → commands}/requirement.md +3 -3
- package/bundled/skills/commands/reverse-bdd.md +47 -0
- package/bundled/skills/commands/reverse-sdd.md +51 -0
- package/bundled/skills/commands/reverse-tdd.md +51 -0
- package/bundled/skills/commands/reverse.md +63 -0
- package/bundled/skills/{claude-code/commands → commands}/review.md +3 -3
- package/bundled/skills/commands/sdd.md +135 -0
- package/bundled/skills/{claude-code/commands → commands}/tdd.md +3 -3
- package/bundled/skills/{claude-code/commands → commands}/update.md +2 -2
- package/bundled/skills/commit-standards/SKILL.md +60 -0
- package/bundled/skills/{claude-code/commit-standards → commit-standards}/conventional-commits.md +3 -3
- package/bundled/skills/{claude-code/commit-standards/SKILL.md → commit-standards/guide.md} +17 -5
- package/bundled/skills/{claude-code/commit-standards → commit-standards}/language-options.md +2 -2
- package/bundled/skills/docs-generator/SKILL.md +69 -0
- package/bundled/skills/docs-generator/guide.md +258 -0
- package/bundled/skills/{claude-code/documentation-guide → documentation-guide}/SKILL.md +7 -7
- package/bundled/skills/{claude-code/documentation-guide → documentation-guide}/documentation-structure.md +3 -3
- package/bundled/skills/{claude-code/documentation-guide → documentation-guide}/readme-template.md +2 -2
- package/bundled/skills/{claude-code/error-code-guide → error-code-guide}/SKILL.md +7 -5
- package/bundled/skills/forward-derivation/SKILL.md +61 -0
- package/bundled/skills/{claude-code/forward-derivation/SKILL.md → forward-derivation/guide.md} +44 -29
- package/bundled/skills/{claude-code/git-workflow-guide → git-workflow-guide}/SKILL.md +7 -5
- package/bundled/skills/{claude-code/git-workflow-guide → git-workflow-guide}/branch-naming.md +2 -2
- package/bundled/skills/{claude-code/git-workflow-guide → git-workflow-guide}/git-workflow.md +3 -3
- package/bundled/skills/{claude-code/logging-guide → logging-guide}/SKILL.md +7 -5
- package/bundled/skills/methodology-system/SKILL.md +75 -0
- package/bundled/skills/{claude-code/methodology-system → methodology-system}/create-methodology.md +1 -1
- package/bundled/skills/{claude-code/methodology-system/SKILL.md → methodology-system/guide.md} +51 -16
- package/bundled/skills/methodology-system/integrated-flow.md +454 -0
- package/bundled/skills/{claude-code/methodology-system → methodology-system}/runtime.md +2 -2
- package/bundled/skills/project-discovery/SKILL.md +63 -0
- package/bundled/skills/project-discovery/guide.md +367 -0
- package/bundled/skills/project-discovery/workflow.md +566 -0
- package/bundled/skills/{claude-code/project-structure-guide → project-structure-guide}/SKILL.md +14 -4
- package/bundled/skills/refactoring-assistant/SKILL.md +78 -0
- package/bundled/skills/{claude-code/refactoring-assistant/SKILL.md → refactoring-assistant/guide.md} +7 -7
- package/bundled/skills/release-standards/SKILL.md +61 -0
- package/bundled/skills/{claude-code/release-standards → release-standards}/changelog-format.md +2 -2
- package/bundled/skills/{claude-code/release-standards/SKILL.md → release-standards/guide.md} +7 -5
- package/bundled/skills/{claude-code/release-standards → release-standards}/release-workflow.md +59 -24
- package/bundled/skills/{claude-code/release-standards → release-standards}/semantic-versioning.md +2 -2
- package/bundled/skills/requirement-assistant/SKILL.md +66 -0
- package/bundled/skills/{claude-code/requirement-assistant/SKILL.md → requirement-assistant/guide.md} +14 -6
- package/bundled/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-checklist.md +2 -2
- package/bundled/skills/{claude-code/requirement-assistant → requirement-assistant}/requirement-writing.md +2 -2
- package/bundled/skills/reverse-engineer/SKILL.md +64 -0
- package/bundled/skills/{claude-code/reverse-engineer → reverse-engineer}/bdd-extraction.md +1 -1
- package/bundled/skills/{claude-code/reverse-engineer/SKILL.md → reverse-engineer/guide.md} +21 -18
- package/bundled/skills/{claude-code/reverse-engineer → reverse-engineer}/tdd-analysis.md +1 -1
- package/bundled/skills/{claude-code/reverse-engineer → reverse-engineer}/workflow.md +2 -2
- package/bundled/skills/spec-driven-dev/SKILL.md +80 -0
- package/bundled/skills/{claude-code/spec-driven-dev/SKILL.md → spec-driven-dev/guide.md} +50 -8
- package/bundled/skills/tdd-assistant/SKILL.md +65 -0
- package/bundled/skills/{claude-code/tdd-assistant/SKILL.md → tdd-assistant/guide.md} +10 -10
- package/bundled/skills/{claude-code/tdd-assistant → tdd-assistant}/language-examples.md +3 -3
- package/bundled/skills/{claude-code/tdd-assistant → tdd-assistant}/tdd-workflow.md +2 -2
- package/bundled/skills/test-coverage-assistant/SKILL.md +63 -0
- package/bundled/skills/{claude-code/test-coverage-assistant/SKILL.md → test-coverage-assistant/guide.md} +39 -24
- package/bundled/skills/{claude-code/testing-guide → testing-guide}/SKILL.md +12 -7
- package/bundled/skills/{claude-code/testing-guide → testing-guide}/testing-pyramid.md +3 -3
- package/bundled/skills/testing-guide/testing-theory.md +2291 -0
- package/bundled/skills/tools/cline/.clinerules +79 -0
- package/bundled/skills/tools/cline/README.md +50 -0
- package/bundled/skills/tools/copilot/README.md +99 -0
- package/bundled/skills/tools/copilot/copilot-instructions.md +71 -0
- package/bundled/skills/tools/cursor/.cursorrules +101 -0
- package/bundled/skills/tools/cursor/README.md +50 -0
- package/bundled/skills/tools/windsurf/.windsurfrules +76 -0
- package/bundled/skills/tools/windsurf/README.md +51 -0
- package/bundled/skills/{claude-code/workflows → workflows}/README.md +1 -1
- package/bundled/skills/workflows/release.workflow.yaml +893 -0
- package/package.json +4 -1
- package/src/commands/check.js +195 -130
- package/src/commands/config.js +1262 -0
- package/src/commands/configure.js +3 -950
- package/src/commands/fix.js +53 -0
- package/src/commands/hitl.js +19 -0
- package/src/commands/init.js +320 -1030
- package/src/commands/list.js +1 -1
- package/src/commands/simulate.js +61 -0
- package/src/commands/spec.js +288 -0
- package/src/commands/start.js +373 -0
- package/src/commands/sweep.js +142 -0
- package/src/commands/update.js +136 -19
- package/src/commands/workflow.js +265 -1
- package/src/config/ai-agent-paths.js +89 -29
- package/src/core/constants.js +7 -1
- package/src/core/manifest.js +1 -0
- package/src/flows/init-flow.js +243 -0
- package/src/hitl/checkpoint.js +80 -0
- package/src/hitl/classifier.js +54 -0
- package/src/hitl/manager.js +88 -0
- package/src/i18n/messages.js +907 -99
- package/src/index.js +1 -0
- package/src/installers/integration-installer.js +237 -0
- package/src/installers/manifest-installer.js +131 -0
- package/src/installers/skills-installer.js +286 -0
- package/src/installers/standards-installer.js +193 -0
- package/src/missions/MissionManager.js +501 -0
- package/src/prompts/init.js +228 -130
- package/src/prompts/integrations.js +13 -1
- package/src/schemas/standard.schema.json +117 -0
- package/src/utils/agents-installer.js +2 -2
- package/src/utils/config-loader.js +47 -0
- package/src/utils/config-manager.js +108 -0
- package/src/utils/config-merger.js +47 -0
- package/src/utils/github.js +22 -18
- package/src/utils/inquirer-patch.js +98 -0
- package/src/utils/integration-generator.js +392 -58
- package/src/utils/reference-sync.js +69 -19
- package/src/utils/skills-installer.js +6 -3
- package/src/utils/standard-fixer.js +141 -0
- package/src/utils/standard-validator.js +329 -0
- package/src/utils/workflow-executor.js +886 -0
- package/src/utils/workflow-state.js +404 -0
- package/src/utils/workflows-installer.js +2 -2
- package/src/vibe/auto-sweep.js +349 -0
- package/src/vibe/micro-spec.js +428 -0
- package/standards-registry.json +278 -102
- package/bundled/locales/zh-CN/skills/claude-code/README.md +0 -174
- package/bundled/locales/zh-CN/skills/claude-code/test-coverage-assistant/SKILL.md +0 -282
- package/bundled/locales/zh-TW/skills/claude-code/README.md +0 -174
- package/bundled/skills/claude-code/README.md +0 -215
- package/bundled/skills/claude-code/commands/changelog.md +0 -57
- package/bundled/skills/claude-code/commands/derive-all.md +0 -214
- package/bundled/skills/claude-code/commands/derive-atdd.md +0 -177
- package/bundled/skills/claude-code/commands/derive-bdd.md +0 -158
- package/bundled/skills/claude-code/commands/derive-tdd.md +0 -259
- package/bundled/skills/claude-code/commands/docs.md +0 -75
- package/bundled/skills/claude-code/commands/release.md +0 -50
- package/bundled/skills/claude-code/commands/reverse-bdd.md +0 -264
- package/bundled/skills/claude-code/commands/reverse-spec.md +0 -185
- package/bundled/skills/claude-code/commands/reverse-tdd.md +0 -351
- package/bundled/skills/claude-code/commands/spec.md +0 -69
- package/bundled/skills/claude-code/methodology-system/integrated-flow.md +0 -322
- /package/bundled/skills/{claude-code/CONTRIBUTING.template.md → CONTRIBUTING.template.md} +0 -0
- /package/bundled/skills/{claude-code/ai → ai}/standards/checkin.ai.yaml +0 -0
- /package/bundled/skills/{claude-code/ai → ai}/standards/commit.ai.yaml +0 -0
- /package/bundled/skills/{claude-code/ai → ai}/standards/refactoring.ai.yaml +0 -0
- /package/bundled/skills/{claude-code/ai → ai}/standards/testing.ai.yaml +0 -0
- /package/bundled/skills/{claude-code/project-structure-guide → project-structure-guide}/language-patterns.md +0 -0
- /package/bundled/skills/{claude-code/workflows → workflows}/code-review.workflow.yaml +0 -0
- /package/bundled/skills/{claude-code/workflows → workflows}/feature-dev.workflow.yaml +0 -0
- /package/bundled/skills/{claude-code/workflows → workflows}/integrated-flow.workflow.yaml +0 -0
- /package/bundled/skills/{claude-code/workflows → workflows}/large-codebase-analysis.workflow.yaml +0 -0
|
@@ -2,9 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
> **Language**: English | [繁體中文](../locales/zh-TW/core/git-workflow.md)
|
|
4
4
|
|
|
5
|
-
**Version**: 1.
|
|
6
|
-
**Last Updated**:
|
|
5
|
+
**Version**: 1.4.0
|
|
6
|
+
**Last Updated**: 2026-01-29
|
|
7
7
|
**Applicability**: All projects using Git for version control
|
|
8
|
+
**Scope**: universal
|
|
9
|
+
**Industry Standards**: None (Industry common practice)
|
|
10
|
+
**References**: [atlassian.com](https://www.atlassian.com/git/tutorials)
|
|
11
|
+
|
|
12
|
+
> **For detailed explanations and tutorials, see [Git Workflow Guide](guides/git-workflow-guide.md)**
|
|
8
13
|
|
|
9
14
|
---
|
|
10
15
|
|
|
@@ -18,83 +23,19 @@ This standard defines Git branching strategies and workflows to ensure consisten
|
|
|
18
23
|
|
|
19
24
|
**PROJECT MUST CHOOSE ONE** workflow strategy and document it clearly.
|
|
20
25
|
|
|
21
|
-
### Decision Tree
|
|
22
|
-
|
|
23
|
-
Use this flowchart to select the appropriate workflow:
|
|
24
|
-
|
|
25
|
-
```
|
|
26
|
-
┌─────────────────────────────────────┐
|
|
27
|
-
│ How often do you deploy to │
|
|
28
|
-
│ production? │
|
|
29
|
-
└───────────────┬─────────────────────┘
|
|
30
|
-
│
|
|
31
|
-
┌───────────────────────┼───────────────────────┐
|
|
32
|
-
▼ ▼ ▼
|
|
33
|
-
┌────────────────┐ ┌────────────────┐ ┌────────────────┐
|
|
34
|
-
│ Multiple times │ │ Weekly to │ │ Monthly or │
|
|
35
|
-
│ per day │ │ bi-weekly │ │ longer │
|
|
36
|
-
└───────┬────────┘ └───────┬────────┘ └───────┬────────┘
|
|
37
|
-
│ │ │
|
|
38
|
-
▼ ▼ ▼
|
|
39
|
-
┌────────────────┐ ┌────────────────┐ ┌────────────────┐
|
|
40
|
-
│ Trunk-Based │ │ GitHub Flow │ │ GitFlow │
|
|
41
|
-
│ Development │ │ │ │ │
|
|
42
|
-
└────────────────┘ └────────────────┘ └────────────────┘
|
|
43
|
-
```
|
|
44
|
-
|
|
45
|
-
### Selection Matrix
|
|
46
|
-
|
|
47
26
|
| Factor | GitFlow | GitHub Flow | Trunk-Based |
|
|
48
27
|
|--------|---------|-------------|-------------|
|
|
49
28
|
| **Release frequency** | Monthly+ | Weekly | Multiple/day |
|
|
50
29
|
| **Team size** | Large (10+) | Medium (5-15) | Small-Medium (3-10) |
|
|
51
30
|
| **CI/CD maturity** | Basic | Intermediate | Advanced |
|
|
52
31
|
| **Feature flags** | Optional | Optional | Required |
|
|
53
|
-
| **Hotfix process** | Dedicated branch | Same as feature | Same as feature |
|
|
54
32
|
| **Complexity** | High | Low | Medium |
|
|
55
33
|
|
|
56
|
-
### Quick Selection Guide
|
|
57
|
-
|
|
58
|
-
**Choose GitFlow if**:
|
|
59
|
-
- You have scheduled release cycles (monthly, quarterly)
|
|
60
|
-
- You maintain multiple production versions simultaneously
|
|
61
|
-
- You have separate teams for development and release management
|
|
62
|
-
|
|
63
|
-
**Choose GitHub Flow if**:
|
|
64
|
-
- You deploy to production weekly or on-demand
|
|
65
|
-
- You have a single production version
|
|
66
|
-
- You want simplicity with good traceability
|
|
67
|
-
|
|
68
|
-
**Choose Trunk-Based if**:
|
|
69
|
-
- You have mature CI/CD with automated testing
|
|
70
|
-
- Your team practices continuous integration
|
|
71
|
-
- You're comfortable with feature flags for incomplete features
|
|
72
|
-
|
|
73
34
|
---
|
|
74
35
|
|
|
75
|
-
##
|
|
76
|
-
|
|
77
|
-
**Best For**:
|
|
78
|
-
- Scheduled releases (monthly, quarterly)
|
|
79
|
-
- Multiple production versions maintained simultaneously
|
|
80
|
-
- Clear distinction between development and production
|
|
81
|
-
- Large teams with formal release processes
|
|
82
|
-
|
|
83
|
-
### Branch Structure
|
|
84
|
-
|
|
85
|
-
```
|
|
86
|
-
main ─●────────●─────────●── (Production releases: v1.0, v2.0)
|
|
87
|
-
╱ ╲ ╲
|
|
88
|
-
develop ────●────●──────●─────────●── (Development mainline)
|
|
89
|
-
╱ ╲ ╲
|
|
90
|
-
feature/* ─●────────● ╲ (Feature branches)
|
|
91
|
-
╲
|
|
92
|
-
release/* ●───● (Release preparation)
|
|
93
|
-
╱
|
|
94
|
-
hotfix/* ────● (Emergency fixes)
|
|
95
|
-
```
|
|
36
|
+
## Branch Types
|
|
96
37
|
|
|
97
|
-
### Branch Types
|
|
38
|
+
### GitFlow Branch Types
|
|
98
39
|
|
|
99
40
|
| Branch Type | Purpose | Base Branch | Merge Target | Lifetime |
|
|
100
41
|
|-------------|---------|-------------|--------------|----------|
|
|
@@ -104,116 +45,7 @@ hotfix/* ────● (Emergency fixes)
|
|
|
104
45
|
| `release/*` | Release prep | `develop` | `main` + `develop` | Temporary |
|
|
105
46
|
| `hotfix/*` | Urgent fixes | `main` | `main` + `develop` | Temporary |
|
|
106
47
|
|
|
107
|
-
###
|
|
108
|
-
|
|
109
|
-
#### 1. Feature Development
|
|
110
|
-
|
|
111
|
-
```bash
|
|
112
|
-
# Create feature branch from develop
|
|
113
|
-
git checkout develop
|
|
114
|
-
git pull origin develop
|
|
115
|
-
git checkout -b feature/oauth-login
|
|
116
|
-
|
|
117
|
-
# Work on feature
|
|
118
|
-
git add .
|
|
119
|
-
git commit -m "feat(auth): add OAuth2 login"
|
|
120
|
-
|
|
121
|
-
# Push to remote
|
|
122
|
-
git push -u origin feature/oauth-login
|
|
123
|
-
|
|
124
|
-
# Create pull request to develop
|
|
125
|
-
# After review approval, merge to develop
|
|
126
|
-
git checkout develop
|
|
127
|
-
git merge --no-ff feature/oauth-login
|
|
128
|
-
git push origin develop
|
|
129
|
-
|
|
130
|
-
# Delete feature branch
|
|
131
|
-
git branch -d feature/oauth-login
|
|
132
|
-
git push origin --delete feature/oauth-login
|
|
133
|
-
```
|
|
134
|
-
|
|
135
|
-
#### 2. Release Preparation
|
|
136
|
-
|
|
137
|
-
> **CHANGELOG Update**: Move entries from `[Unreleased]` to the new version section and add the release date. See [changelog-standards.md](changelog-standards.md) for detailed guidelines.
|
|
138
|
-
|
|
139
|
-
```bash
|
|
140
|
-
# Create release branch from develop
|
|
141
|
-
git checkout develop
|
|
142
|
-
git pull origin develop
|
|
143
|
-
git checkout -b release/v1.2.0
|
|
144
|
-
|
|
145
|
-
# Prepare release (version bump, changelog, etc.)
|
|
146
|
-
# 1. Update CHANGELOG.md: move [Unreleased] to [1.2.0] - YYYY-MM-DD
|
|
147
|
-
# 2. Update version in package.json (or equivalent)
|
|
148
|
-
npm version 1.2.0
|
|
149
|
-
git add package.json CHANGELOG.md
|
|
150
|
-
git commit -m "chore(release): prepare v1.2.0"
|
|
151
|
-
|
|
152
|
-
# Merge to main
|
|
153
|
-
git checkout main
|
|
154
|
-
git merge --no-ff release/v1.2.0
|
|
155
|
-
git tag -a v1.2.0 -m "Release version 1.2.0"
|
|
156
|
-
git push origin main --tags
|
|
157
|
-
|
|
158
|
-
# Merge back to develop
|
|
159
|
-
git checkout develop
|
|
160
|
-
git merge --no-ff release/v1.2.0
|
|
161
|
-
git push origin develop
|
|
162
|
-
|
|
163
|
-
# Delete release branch
|
|
164
|
-
git branch -d release/v1.2.0
|
|
165
|
-
git push origin --delete release/v1.2.0
|
|
166
|
-
```
|
|
167
|
-
|
|
168
|
-
#### 3. Hotfix
|
|
169
|
-
|
|
170
|
-
```bash
|
|
171
|
-
# Create hotfix branch from main
|
|
172
|
-
git checkout main
|
|
173
|
-
git pull origin main
|
|
174
|
-
git checkout -b hotfix/critical-security-fix
|
|
175
|
-
|
|
176
|
-
# Fix the issue
|
|
177
|
-
git add .
|
|
178
|
-
git commit -m "fix(security): patch SQL injection vulnerability"
|
|
179
|
-
|
|
180
|
-
# Merge to main
|
|
181
|
-
git checkout main
|
|
182
|
-
git merge --no-ff hotfix/critical-security-fix
|
|
183
|
-
git tag -a v1.2.1 -m "Hotfix version 1.2.1"
|
|
184
|
-
git push origin main --tags
|
|
185
|
-
|
|
186
|
-
# Merge to develop
|
|
187
|
-
git checkout develop
|
|
188
|
-
git merge --no-ff hotfix/critical-security-fix
|
|
189
|
-
git push origin develop
|
|
190
|
-
|
|
191
|
-
# Delete hotfix branch
|
|
192
|
-
git branch -d hotfix/critical-security-fix
|
|
193
|
-
git push origin --delete hotfix/critical-security-fix
|
|
194
|
-
```
|
|
195
|
-
|
|
196
|
-
---
|
|
197
|
-
|
|
198
|
-
## Strategy B: GitHub Flow
|
|
199
|
-
|
|
200
|
-
**Best For**:
|
|
201
|
-
- Continuous deployment
|
|
202
|
-
- Web applications
|
|
203
|
-
- Small to medium teams
|
|
204
|
-
- Fast iteration cycles
|
|
205
|
-
|
|
206
|
-
### Branch Structure
|
|
207
|
-
|
|
208
|
-
```
|
|
209
|
-
main ────●─────────●──────●── (Always deployable)
|
|
210
|
-
╲ ╱ ╱
|
|
211
|
-
feature/* ●───●───● ╱ (Feature + PR)
|
|
212
|
-
╱
|
|
213
|
-
bugfix/* ────● (Bug fixes)
|
|
214
|
-
```
|
|
215
|
-
|
|
216
|
-
### Branch Types
|
|
48
|
+
### GitHub Flow Branch Types
|
|
217
49
|
|
|
218
50
|
| Branch Type | Purpose | Base Branch | Merge Target | Lifetime |
|
|
219
51
|
|-------------|---------|-------------|--------------|----------|
|
|
@@ -222,163 +54,13 @@ bugfix/* ────● (Bug fixes)
|
|
|
222
54
|
| `bugfix/*` | Bug fixes | `main` | `main` | Temporary |
|
|
223
55
|
| `hotfix/*` | Urgent fixes | `main` | `main` | Temporary |
|
|
224
56
|
|
|
225
|
-
###
|
|
226
|
-
|
|
227
|
-
```bash
|
|
228
|
-
# 1. Create feature branch from main
|
|
229
|
-
git checkout main
|
|
230
|
-
git pull origin main
|
|
231
|
-
git checkout -b feature/user-profile
|
|
232
|
-
|
|
233
|
-
# 2. Work and commit frequently
|
|
234
|
-
git add .
|
|
235
|
-
git commit -m "feat(profile): add avatar upload"
|
|
236
|
-
git push -u origin feature/user-profile
|
|
237
|
-
|
|
238
|
-
# 3. Open pull request to main
|
|
239
|
-
# Use GitHub/GitLab UI to create PR
|
|
240
|
-
|
|
241
|
-
# 4. After CI passes and review approval, merge to main
|
|
242
|
-
# (Usually done via GitHub/GitLab UI with "Squash and merge")
|
|
243
|
-
|
|
244
|
-
# 5. Deploy main to production
|
|
245
|
-
git checkout main
|
|
246
|
-
git pull origin main
|
|
247
|
-
# Trigger deployment pipeline
|
|
248
|
-
|
|
249
|
-
# 6. Delete feature branch (auto-deleted by GitHub/GitLab)
|
|
250
|
-
```
|
|
251
|
-
|
|
252
|
-
### Key Principles
|
|
253
|
-
|
|
254
|
-
1. **`main` is always deployable**
|
|
255
|
-
2. **Branch from `main`**
|
|
256
|
-
3. **Merge to `main` via PR**
|
|
257
|
-
4. **Deploy immediately after merge**
|
|
258
|
-
|
|
259
|
-
---
|
|
260
|
-
|
|
261
|
-
## Strategy C: Trunk-Based Development
|
|
262
|
-
|
|
263
|
-
**Best For**:
|
|
264
|
-
- Mature CI/CD pipelines
|
|
265
|
-
- High-trust, experienced teams
|
|
266
|
-
- Frequent integration (multiple times per day)
|
|
267
|
-
- Feature flags for incomplete features
|
|
268
|
-
|
|
269
|
-
### Branch Structure
|
|
270
|
-
|
|
271
|
-
```
|
|
272
|
-
main ────●─●─●─●─●─●─●──► (Single long-lived branch)
|
|
273
|
-
╲│╱ ╲│╱ ╲│╱
|
|
274
|
-
feature/* ● ● ● (Very short-lived, ≤2 days)
|
|
275
|
-
```
|
|
276
|
-
|
|
277
|
-
### Branch Types
|
|
57
|
+
### Trunk-Based Branch Types
|
|
278
58
|
|
|
279
59
|
| Branch Type | Purpose | Base Branch | Merge Target | Lifetime |
|
|
280
60
|
|-------------|---------|-------------|--------------|----------|
|
|
281
61
|
| `main` | Trunk | - | - | Permanent |
|
|
282
62
|
| `feature/*` | Small changes | `main` | `main` | ≤2 days |
|
|
283
63
|
|
|
284
|
-
### Workflow Steps
|
|
285
|
-
|
|
286
|
-
```bash
|
|
287
|
-
# 1. Create short-lived branch
|
|
288
|
-
git checkout main
|
|
289
|
-
git pull origin main
|
|
290
|
-
git checkout -b feature/add-validation
|
|
291
|
-
|
|
292
|
-
# 2. Make small, atomic change
|
|
293
|
-
git add .
|
|
294
|
-
git commit -m "feat(validation): add email format check"
|
|
295
|
-
|
|
296
|
-
# 3. Push and create PR (same day)
|
|
297
|
-
git push -u origin feature/add-validation
|
|
298
|
-
|
|
299
|
-
# 4. Merge quickly after review (within hours)
|
|
300
|
-
# Prefer rebase to keep linear history
|
|
301
|
-
git checkout main
|
|
302
|
-
git pull origin main
|
|
303
|
-
git rebase main feature/add-validation
|
|
304
|
-
git checkout main
|
|
305
|
-
git merge --ff-only feature/add-validation
|
|
306
|
-
git push origin main
|
|
307
|
-
|
|
308
|
-
# 5. Delete branch immediately
|
|
309
|
-
git branch -d feature/add-validation
|
|
310
|
-
git push origin --delete feature/add-validation
|
|
311
|
-
```
|
|
312
|
-
|
|
313
|
-
### Key Principles
|
|
314
|
-
|
|
315
|
-
1. **Integrate frequently** (multiple times per day)
|
|
316
|
-
2. **Keep branches short-lived** (≤2 days)
|
|
317
|
-
3. **Use feature flags** for incomplete features
|
|
318
|
-
4. **Automate everything** (tests, builds, deployments)
|
|
319
|
-
|
|
320
|
-
---
|
|
321
|
-
|
|
322
|
-
## Pre-branch Checklist
|
|
323
|
-
|
|
324
|
-
Before creating a new branch, complete these checks to prevent common issues.
|
|
325
|
-
|
|
326
|
-
### For GitFlow and GitHub Flow
|
|
327
|
-
|
|
328
|
-
#### 1. Check for Unmerged Branches
|
|
329
|
-
|
|
330
|
-
```bash
|
|
331
|
-
git branch --no-merged main
|
|
332
|
-
# For GitFlow, also check:
|
|
333
|
-
git branch --no-merged develop
|
|
334
|
-
```
|
|
335
|
-
|
|
336
|
-
- **If unmerged branches exist, handle them first** (merge or close)
|
|
337
|
-
- **Do NOT create new feature branches with unmerged work pending**
|
|
338
|
-
|
|
339
|
-
#### 2. Sync Latest Code
|
|
340
|
-
|
|
341
|
-
```bash
|
|
342
|
-
git checkout main # or develop for GitFlow
|
|
343
|
-
git pull origin main
|
|
344
|
-
```
|
|
345
|
-
|
|
346
|
-
#### 3. Verify Tests Pass
|
|
347
|
-
|
|
348
|
-
```bash
|
|
349
|
-
# Run your project's test suite
|
|
350
|
-
npm test # Node.js
|
|
351
|
-
pytest # Python
|
|
352
|
-
./gradlew test # Java/Kotlin
|
|
353
|
-
```
|
|
354
|
-
|
|
355
|
-
#### 4. Create Branch
|
|
356
|
-
|
|
357
|
-
```bash
|
|
358
|
-
git checkout -b feature/description
|
|
359
|
-
```
|
|
360
|
-
|
|
361
|
-
### Why This Matters
|
|
362
|
-
|
|
363
|
-
| Consequence of Skipping | Impact |
|
|
364
|
-
|------------------------|--------|
|
|
365
|
-
| Fixes scattered across branches | `main` still has bugs |
|
|
366
|
-
| Features depend on each other | New branch missing previous feature's code |
|
|
367
|
-
| Merge order confusion | More conflicts, harder to track history |
|
|
368
|
-
| Incomplete testing | Each branch only tests its own part |
|
|
369
|
-
|
|
370
|
-
### For Trunk-Based Development
|
|
371
|
-
|
|
372
|
-
Trunk-Based Development has **different requirements** due to its short-lived branch nature (≤2 days):
|
|
373
|
-
|
|
374
|
-
| Check | Applicability | Notes |
|
|
375
|
-
|-------|--------------|-------|
|
|
376
|
-
| Check unmerged branches | ⚠️ **Less relevant** | Branches should not exist >2 days by design |
|
|
377
|
-
| Sync latest code | ✅ **Critical** | Even more important due to frequent integration |
|
|
378
|
-
| Verify tests pass | ✅ **Critical** | Automation is core to this workflow |
|
|
379
|
-
|
|
380
|
-
**Key difference**: If you have unmerged branches older than 2 days in Trunk-Based Development, this itself violates the workflow principles. Focus on **frequent integration** rather than checking for unmerged branches.
|
|
381
|
-
|
|
382
64
|
---
|
|
383
65
|
|
|
384
66
|
## Branch Naming Conventions
|
|
@@ -400,7 +82,7 @@ Trunk-Based Development has **different requirements** due to its short-lived br
|
|
|
400
82
|
| `docs/` | Documentation only | `docs/api-reference` |
|
|
401
83
|
| `test/` | Test additions | `test/integration-tests` |
|
|
402
84
|
| `chore/` | Maintenance tasks | `chore/update-dependencies` |
|
|
403
|
-
| `release/` | Release preparation (GitFlow
|
|
85
|
+
| `release/` | Release preparation (GitFlow) | `release/v1.2.0` |
|
|
404
86
|
|
|
405
87
|
### Naming Rules
|
|
406
88
|
|
|
@@ -409,142 +91,56 @@ Trunk-Based Development has **different requirements** due to its short-lived br
|
|
|
409
91
|
3. **Be descriptive but concise**
|
|
410
92
|
4. **Avoid issue numbers as only identifier**
|
|
411
93
|
|
|
412
|
-
**Good Examples**:
|
|
413
|
-
```
|
|
414
|
-
feature/user-authentication
|
|
415
|
-
fix/null-pointer-in-payment
|
|
416
|
-
hotfix/critical-data-loss
|
|
417
|
-
refactor/database-connection-pool
|
|
418
|
-
docs/update-installation-guide
|
|
419
|
-
```
|
|
420
|
-
|
|
421
|
-
**Bad Examples**:
|
|
422
|
-
```
|
|
423
|
-
feature/123 # ❌ Not descriptive
|
|
424
|
-
Fix-Bug # ❌ Not lowercase, vague
|
|
425
|
-
feature/add_new_feature # ❌ Underscores, too vague
|
|
426
|
-
myFeature # ❌ camelCase, no type prefix
|
|
427
|
-
```
|
|
428
|
-
|
|
429
94
|
---
|
|
430
95
|
|
|
431
96
|
## Merge Strategies
|
|
432
97
|
|
|
433
98
|
**PROJECT MUST CHOOSE ONE** for each branch type.
|
|
434
99
|
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
**
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
git merge --no-ff feature/user-auth
|
|
441
|
-
```
|
|
442
|
-
|
|
443
|
-
**Pros**:
|
|
444
|
-
- ✅ Complete history preserved
|
|
445
|
-
- ✅ Easy to revert entire feature
|
|
446
|
-
- ✅ Clear feature boundaries
|
|
447
|
-
|
|
448
|
-
**Cons**:
|
|
449
|
-
- ❌ Cluttered git log
|
|
450
|
-
- ❌ Complex graph visualization
|
|
451
|
-
|
|
452
|
-
**Best For**: GitFlow, long-lived features
|
|
453
|
-
|
|
454
|
-
---
|
|
455
|
-
|
|
456
|
-
### Option 2: Squash Merge
|
|
457
|
-
|
|
458
|
-
**Combines all commits into one**
|
|
459
|
-
|
|
460
|
-
```bash
|
|
461
|
-
git merge --squash feature/user-auth
|
|
462
|
-
git commit -m "feat(auth): add user authentication"
|
|
463
|
-
```
|
|
464
|
-
|
|
465
|
-
**Pros**:
|
|
466
|
-
- ✅ Clean, linear history
|
|
467
|
-
- ✅ One commit per feature
|
|
468
|
-
- ✅ Easy to read git log
|
|
469
|
-
|
|
470
|
-
**Cons**:
|
|
471
|
-
- ❌ Loses detailed history
|
|
472
|
-
- ❌ Can't cherry-pick individual commits
|
|
473
|
-
|
|
474
|
-
**Best For**: GitHub Flow, feature branches
|
|
100
|
+
| Strategy | Command | Best For | Pros | Cons |
|
|
101
|
+
|----------|---------|----------|------|------|
|
|
102
|
+
| **Merge Commit** | `git merge --no-ff` | GitFlow, long-lived features | Complete history, easy revert | Cluttered log |
|
|
103
|
+
| **Squash Merge** | `git merge --squash` | GitHub Flow, feature branches | Clean history, one commit per feature | Loses detail |
|
|
104
|
+
| **Rebase + FF** | `git rebase && git merge --ff-only` | Trunk-Based, short-lived branches | Linear history, preserves commits | Rewrites history |
|
|
475
105
|
|
|
476
106
|
---
|
|
477
107
|
|
|
478
|
-
|
|
108
|
+
## Pre-branch Checklist
|
|
479
109
|
|
|
480
|
-
|
|
110
|
+
Before creating a new branch, complete these checks:
|
|
481
111
|
|
|
482
|
-
|
|
483
|
-
git rebase main feature/user-auth
|
|
484
|
-
git checkout main
|
|
485
|
-
git merge --ff-only feature/user-auth
|
|
486
|
-
```
|
|
112
|
+
### For GitFlow and GitHub Flow
|
|
487
113
|
|
|
488
|
-
|
|
489
|
-
-
|
|
490
|
-
-
|
|
491
|
-
-
|
|
114
|
+
- [ ] Check for unmerged branches: `git branch --no-merged main`
|
|
115
|
+
- [ ] Sync latest code: `git checkout main && git pull origin main`
|
|
116
|
+
- [ ] Verify tests pass: Run project test suite
|
|
117
|
+
- [ ] Create branch: `git checkout -b feature/description`
|
|
492
118
|
|
|
493
|
-
|
|
494
|
-
- ❌ Rewrites history (don't use on shared branches)
|
|
495
|
-
- ❌ Resolving conflicts can be tedious
|
|
119
|
+
### For Trunk-Based Development
|
|
496
120
|
|
|
497
|
-
|
|
121
|
+
- [ ] Sync latest code: `git checkout main && git pull origin main` (Critical)
|
|
122
|
+
- [ ] Verify tests pass (Critical)
|
|
123
|
+
- [ ] Create short-lived branch: `git checkout -b feature/description`
|
|
498
124
|
|
|
499
125
|
---
|
|
500
126
|
|
|
501
127
|
## Conflict Resolution
|
|
502
128
|
|
|
503
|
-
### Prevention
|
|
129
|
+
### Prevention Checklist
|
|
504
130
|
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
git pull origin main
|
|
509
|
-
git checkout feature/my-feature
|
|
510
|
-
git merge main # or git rebase main
|
|
511
|
-
```
|
|
512
|
-
|
|
513
|
-
2. **Keep branches small**
|
|
514
|
-
- Avoid long-lived feature branches
|
|
515
|
-
- Break large features into smaller PRs
|
|
516
|
-
|
|
517
|
-
3. **Communicate**
|
|
518
|
-
- Announce major refactoring
|
|
519
|
-
- Coordinate on shared files
|
|
131
|
+
- [ ] Sync frequently with base branch
|
|
132
|
+
- [ ] Keep branches small (avoid long-lived feature branches)
|
|
133
|
+
- [ ] Communicate major refactoring to team
|
|
520
134
|
|
|
521
135
|
### Resolution Steps
|
|
522
136
|
|
|
523
137
|
```bash
|
|
524
|
-
|
|
525
|
-
git checkout main
|
|
526
|
-
|
|
527
|
-
git checkout feature/my-feature
|
|
528
|
-
git merge main
|
|
529
|
-
|
|
530
|
-
# 2. Conflicts occur - Git marks them in files
|
|
531
|
-
# Open files and resolve conflicts:
|
|
532
|
-
# <<<<<<< HEAD
|
|
533
|
-
# Current branch changes
|
|
534
|
-
# =======
|
|
535
|
-
# Incoming changes
|
|
536
|
-
# >>>>>>> main
|
|
537
|
-
|
|
538
|
-
# 3. After resolving, stage files
|
|
138
|
+
git checkout main && git pull origin main
|
|
139
|
+
git checkout feature/my-feature && git merge main
|
|
140
|
+
# Resolve conflicts in marked files
|
|
539
141
|
git add resolved-file.js
|
|
540
|
-
|
|
541
|
-
# 4. Complete the merge
|
|
542
142
|
git commit -m "chore: resolve merge conflicts with main"
|
|
543
|
-
|
|
544
|
-
# 5. Test thoroughly
|
|
545
|
-
npm test
|
|
546
|
-
|
|
547
|
-
# 6. Push
|
|
143
|
+
npm test # Verify
|
|
548
144
|
git push origin feature/my-feature
|
|
549
145
|
```
|
|
550
146
|
|
|
@@ -554,71 +150,45 @@ git push origin feature/my-feature
|
|
|
554
150
|
|
|
555
151
|
### Semantic Versioning
|
|
556
152
|
|
|
557
|
-
Follow [Semantic Versioning 2.0.0](https://semver.org/):
|
|
558
|
-
|
|
559
153
|
```
|
|
560
154
|
MAJOR.MINOR.PATCH
|
|
561
|
-
|
|
562
|
-
Example: v2.3.1
|
|
563
155
|
```
|
|
564
156
|
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
157
|
+
| Component | When to Increment | Example |
|
|
158
|
+
|-----------|-------------------|---------|
|
|
159
|
+
| **MAJOR** | Breaking changes | v2.0.0 |
|
|
160
|
+
| **MINOR** | New features (backward-compatible) | v1.2.0 |
|
|
161
|
+
| **PATCH** | Bug fixes (backward-compatible) | v1.2.1 |
|
|
162
|
+
|
|
163
|
+
### Pre-release Versions
|
|
164
|
+
|
|
165
|
+
| Type | Format | Example |
|
|
166
|
+
|------|--------|---------|
|
|
167
|
+
| Alpha | `X.Y.Z-alpha.N` | v1.2.0-alpha.1 |
|
|
168
|
+
| Beta | `X.Y.Z-beta.N` | v1.2.0-beta.2 |
|
|
169
|
+
| RC | `X.Y.Z-rc.N` | v1.2.0-rc.1 |
|
|
568
170
|
|
|
569
171
|
### Creating Tags
|
|
570
172
|
|
|
571
173
|
```bash
|
|
572
|
-
# Annotated tag (recommended)
|
|
573
174
|
git tag -a v1.2.0 -m "Release version 1.2.0: Add OAuth2 support"
|
|
574
|
-
|
|
575
|
-
# Push tag to remote
|
|
576
175
|
git push origin v1.2.0
|
|
577
|
-
|
|
578
|
-
# Push all tags
|
|
579
|
-
git push origin --tags
|
|
580
|
-
|
|
581
|
-
# List tags
|
|
582
|
-
git tag -l
|
|
583
|
-
```
|
|
584
|
-
|
|
585
|
-
### Pre-release Versions
|
|
586
|
-
|
|
587
|
-
```
|
|
588
|
-
v1.2.0-alpha.1 # Alpha release
|
|
589
|
-
v1.2.0-beta.2 # Beta release
|
|
590
|
-
v1.2.0-rc.1 # Release candidate
|
|
591
176
|
```
|
|
592
177
|
|
|
593
178
|
---
|
|
594
179
|
|
|
595
180
|
## Protected Branches
|
|
596
181
|
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
### Recommended Protection for `main`/`develop`:
|
|
182
|
+
### Recommended Protection for `main`/`develop`
|
|
600
183
|
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
```
|
|
610
|
-
Settings → Branches → Branch protection rules
|
|
611
|
-
|
|
612
|
-
Rule: main
|
|
613
|
-
☑ Require pull request before merging
|
|
614
|
-
☑ Require approvals: 1
|
|
615
|
-
☑ Require status checks before merging
|
|
616
|
-
☑ Require branches to be up to date
|
|
617
|
-
☑ Status checks: CI/Build, Lint, Tests
|
|
618
|
-
☑ Do not allow bypassing the above settings
|
|
619
|
-
☐ Allow force pushes
|
|
620
|
-
☐ Allow deletions
|
|
621
|
-
```
|
|
184
|
+
| Setting | Required |
|
|
185
|
+
|---------|----------|
|
|
186
|
+
| Require pull request reviews | ✅ (1-2 reviewers) |
|
|
187
|
+
| Require status checks to pass | ✅ (CI tests, linting) |
|
|
188
|
+
| Require branches to be up to date | ✅ |
|
|
189
|
+
| Include administrators | ✅ |
|
|
190
|
+
| Allow force pushes | ❌ |
|
|
191
|
+
| Allow deletions | ❌ |
|
|
622
192
|
|
|
623
193
|
---
|
|
624
194
|
|
|
@@ -634,194 +204,17 @@ Rule: main
|
|
|
634
204
|
- [ ] **Breaking changes highlighted** in description
|
|
635
205
|
- [ ] **Screenshots/GIFs** for UI changes
|
|
636
206
|
|
|
637
|
-
### PR
|
|
638
|
-
|
|
639
|
-
```markdown
|
|
640
|
-
## What
|
|
641
|
-
|
|
642
|
-
[Brief description of what this PR does]
|
|
643
|
-
|
|
644
|
-
## Why
|
|
645
|
-
|
|
646
|
-
[Explanation of why this change is needed]
|
|
647
|
-
|
|
648
|
-
## Changes
|
|
649
|
-
|
|
650
|
-
- [Bullet list of main changes]
|
|
651
|
-
- [Mark breaking changes with ⚠️]
|
|
652
|
-
|
|
653
|
-
## Testing
|
|
654
|
-
|
|
655
|
-
- [ ] Unit tests added/updated
|
|
656
|
-
- [ ] Integration tests pass
|
|
657
|
-
- [ ] Manual testing performed
|
|
658
|
-
|
|
659
|
-
## Screenshots (if applicable)
|
|
207
|
+
### PR Type Reference
|
|
660
208
|
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
## Git Commands Reference
|
|
672
|
-
|
|
673
|
-
### Daily Operations
|
|
674
|
-
|
|
675
|
-
```bash
|
|
676
|
-
# Check status
|
|
677
|
-
git status
|
|
678
|
-
|
|
679
|
-
# View changes
|
|
680
|
-
git diff
|
|
681
|
-
git diff --staged
|
|
682
|
-
|
|
683
|
-
# Stage changes
|
|
684
|
-
git add file.js
|
|
685
|
-
git add .
|
|
686
|
-
|
|
687
|
-
# Commit
|
|
688
|
-
git commit -m "feat: add feature"
|
|
689
|
-
|
|
690
|
-
# Push
|
|
691
|
-
git push origin feature/my-feature
|
|
692
|
-
|
|
693
|
-
# Pull latest
|
|
694
|
-
git pull origin main
|
|
695
|
-
|
|
696
|
-
# View history
|
|
697
|
-
git log --oneline --graph --all
|
|
698
|
-
```
|
|
699
|
-
|
|
700
|
-
### Branch Operations
|
|
701
|
-
|
|
702
|
-
```bash
|
|
703
|
-
# List branches
|
|
704
|
-
git branch -a
|
|
705
|
-
|
|
706
|
-
# Create branch
|
|
707
|
-
git checkout -b feature/new-feature
|
|
708
|
-
|
|
709
|
-
# Switch branch
|
|
710
|
-
git checkout main
|
|
711
|
-
|
|
712
|
-
# Delete local branch
|
|
713
|
-
git branch -d feature/old-feature
|
|
714
|
-
|
|
715
|
-
# Delete remote branch
|
|
716
|
-
git push origin --delete feature/old-feature
|
|
717
|
-
|
|
718
|
-
# Rename branch
|
|
719
|
-
git branch -m old-name new-name
|
|
720
|
-
```
|
|
721
|
-
|
|
722
|
-
### Advanced Operations
|
|
723
|
-
|
|
724
|
-
```bash
|
|
725
|
-
# Stash changes
|
|
726
|
-
git stash
|
|
727
|
-
git stash pop
|
|
728
|
-
|
|
729
|
-
# Cherry-pick commit
|
|
730
|
-
git cherry-pick <commit-hash>
|
|
731
|
-
|
|
732
|
-
# Revert commit
|
|
733
|
-
git revert <commit-hash>
|
|
734
|
-
|
|
735
|
-
# Reset to previous commit (dangerous!)
|
|
736
|
-
git reset --hard <commit-hash>
|
|
737
|
-
|
|
738
|
-
# Amend last commit
|
|
739
|
-
git commit --amend
|
|
740
|
-
|
|
741
|
-
# Interactive rebase (clean up commits)
|
|
742
|
-
git rebase -i HEAD~3
|
|
743
|
-
```
|
|
744
|
-
|
|
745
|
-
---
|
|
746
|
-
|
|
747
|
-
## Project Configuration Template
|
|
748
|
-
|
|
749
|
-
Document your workflow in `CONTRIBUTING.md`:
|
|
750
|
-
|
|
751
|
-
```markdown
|
|
752
|
-
## Git Workflow
|
|
753
|
-
|
|
754
|
-
### Branching Strategy
|
|
755
|
-
This project uses **[GitFlow / GitHub Flow / Trunk-Based Development]**.
|
|
756
|
-
|
|
757
|
-
### Branch Types
|
|
758
|
-
- `main`: Production code
|
|
759
|
-
- `develop`: Development mainline (GitFlow only)
|
|
760
|
-
- `feature/*`: New features
|
|
761
|
-
- `fix/*`: Bug fixes
|
|
762
|
-
- `hotfix/*`: Urgent production fixes
|
|
763
|
-
|
|
764
|
-
### Branch Naming
|
|
765
|
-
Format: `<type>/<description>`
|
|
766
|
-
Example: `feature/oauth-login`, `fix/memory-leak`
|
|
767
|
-
|
|
768
|
-
### Merge Strategy
|
|
769
|
-
- Feature branches: **[Squash / Merge commit / Rebase]**
|
|
770
|
-
- Release branches: Merge commit (--no-ff)
|
|
771
|
-
- Hotfix branches: Merge commit (--no-ff)
|
|
772
|
-
|
|
773
|
-
### Protected Branches
|
|
774
|
-
- `main`: Requires 1 review, CI must pass
|
|
775
|
-
- `develop`: Requires 1 review (if using GitFlow)
|
|
776
|
-
|
|
777
|
-
### Pull Request Process
|
|
778
|
-
1. Create branch from `[main/develop]`
|
|
779
|
-
2. Make changes and push
|
|
780
|
-
3. Open PR with description
|
|
781
|
-
4. Wait for review approval
|
|
782
|
-
5. Ensure CI passes
|
|
783
|
-
6. Merge using **[strategy]**
|
|
784
|
-
```
|
|
785
|
-
|
|
786
|
-
---
|
|
787
|
-
|
|
788
|
-
## Troubleshooting
|
|
789
|
-
|
|
790
|
-
### Accidentally Committed to Wrong Branch
|
|
791
|
-
|
|
792
|
-
```bash
|
|
793
|
-
# Undo last commit but keep changes
|
|
794
|
-
git reset --soft HEAD~1
|
|
795
|
-
|
|
796
|
-
# Switch to correct branch
|
|
797
|
-
git checkout correct-branch
|
|
798
|
-
|
|
799
|
-
# Commit changes
|
|
800
|
-
git add .
|
|
801
|
-
git commit -m "feat: add feature"
|
|
802
|
-
```
|
|
803
|
-
|
|
804
|
-
### Need to Update Branch from Main
|
|
805
|
-
|
|
806
|
-
```bash
|
|
807
|
-
# Option 1: Merge (preserves history)
|
|
808
|
-
git checkout feature/my-feature
|
|
809
|
-
git merge main
|
|
810
|
-
|
|
811
|
-
# Option 2: Rebase (cleaner history)
|
|
812
|
-
git checkout feature/my-feature
|
|
813
|
-
git rebase main
|
|
814
|
-
```
|
|
815
|
-
|
|
816
|
-
### Accidentally Force Pushed to Protected Branch
|
|
817
|
-
|
|
818
|
-
```bash
|
|
819
|
-
# ⚠️ Contact team immediately
|
|
820
|
-
# ⚠️ Check if branch protection was enabled
|
|
821
|
-
# ⚠️ Restore from reflog if needed:
|
|
822
|
-
git reflog
|
|
823
|
-
git reset --hard <previous-commit-hash>
|
|
824
|
-
```
|
|
209
|
+
| Type | Purpose | Example |
|
|
210
|
+
|------|---------|---------|
|
|
211
|
+
| `feat` | New feature | `feat(auth): add OAuth2 login` |
|
|
212
|
+
| `fix` | Bug fix | `fix(api): handle null response` |
|
|
213
|
+
| `docs` | Documentation | `docs(readme): update install steps` |
|
|
214
|
+
| `refactor` | Code refactoring | `refactor(utils): extract validation` |
|
|
215
|
+
| `test` | Adding tests | `test(auth): add login unit tests` |
|
|
216
|
+
| `chore` | Maintenance | `chore(deps): update lodash` |
|
|
217
|
+
| `perf` | Performance | `perf(query): optimize user lookup` |
|
|
825
218
|
|
|
826
219
|
---
|
|
827
220
|
|
|
@@ -838,22 +231,15 @@ git reset --hard <previous-commit-hash>
|
|
|
838
231
|
|
|
839
232
|
| Version | Date | Changes |
|
|
840
233
|
|---------|------|---------|
|
|
234
|
+
| 1.4.0 | 2026-01-29 | Refactored: Split into Rules + Guide, moved tutorials to guide |
|
|
235
|
+
| 1.3.0 | 2026-01-24 | Added: Trunk-Based + Feature Flags integration, Ship/Show/Ask decision model, Stacked PRs workflow |
|
|
841
236
|
| 1.2.1 | 2025-12-24 | Added: Related Standards section |
|
|
842
|
-
| 1.2.0 | 2025-12-16 | Added: Decision tree, selection matrix
|
|
843
|
-
| 1.1.0 | 2025-12-08 | Add pre-branch checklist section
|
|
237
|
+
| 1.2.0 | 2025-12-16 | Added: Decision tree, selection matrix |
|
|
238
|
+
| 1.1.0 | 2025-12-08 | Add pre-branch checklist section |
|
|
844
239
|
| 1.0.0 | 2025-11-12 | Initial Git workflow standard |
|
|
845
240
|
|
|
846
241
|
---
|
|
847
242
|
|
|
848
|
-
## References
|
|
849
|
-
|
|
850
|
-
- [GitFlow Original Article](https://nvie.com/posts/a-successful-git-branching-model/)
|
|
851
|
-
- [GitHub Flow Guide](https://guides.github.com/introduction/flow/)
|
|
852
|
-
- [Trunk-Based Development](https://trunkbaseddevelopment.com/)
|
|
853
|
-
- [Semantic Versioning](https://semver.org/)
|
|
854
|
-
|
|
855
|
-
---
|
|
856
|
-
|
|
857
243
|
## License
|
|
858
244
|
|
|
859
245
|
This standard is released under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/).
|