💻 Development Guide

Git Workflow & Branching Strategy

Git branching model and contribution workflow for Ever Gauzy.

Branching Model

This diagram could not be drawn, so its source is shown.
gitgraph
    commit id: "Initial"
    branch develop
    checkout develop
    commit id: "Feature A"
    branch feature/task-view
    commit id: "Task view WIP"
    commit id: "Task view done"
    checkout develop
    merge feature/task-view
    branch release/1.0
    commit id: "Release prep"
    checkout main
    merge release/1.0 tag: "v1.0.0"
    checkout develop
    merge release/1.0

Branch Naming

Branch TypePatternExample
Featurefeature/{description}feature/daily-plans
Bugfixfix/{description}fix/timer-not-stopping
Hotfixhotfix/{description}hotfix/security-patch
Releaserelease/{version}release/1.5.0
Documentationdocs/{description}docs/api-reference

Commit Messages

Follow Conventional Commits:

feat(task): add daily plan feature
fix(timer): resolve timer not stopping on idle
docs(api): add employee endpoint docs
chore(deps): upgrade NestJS to v10
refactor(auth): simplify JWT validation
test(employee): add unit tests for employee service

Pull Request Process

  1. Create feature branch from develop
  2. Implement changes with tests
  3. Open PR targeting develop
  4. Wait for CI checks to pass
  5. Request review from 1-2 reviewers
  6. Address review comments
  7. Squash merge into develop

CI Checks

CheckDescription
Buildyarn build succeeds
Lintyarn lint passes
Unit Testsyarn test passes
E2E TestsPlaywright tests pass
Code CoverageCoverage meets threshold

Edit this page

Copyright © 2023-Present Ever Co. LTD.Docs by Sourcey