Loading...
Generate Git workflows for any team size
Simple yet effective Git workflow for individual developers
Branch Strategy
Trunk-based development with short-lived feature branches
Release Strategy
Git tags for versioning, direct main branch releases
Start
Branch off main for each new feature
git checkout -b feat/my-featureDevelop
Commit early and often with conventional commits
git commit -m "feat: add new feature"Sync
Keep your branch up to date
git fetch && git rebase origin/mainReview
Review your changes before merging
git diff mainMerge
Merge with a merge commit
git checkout main && git merge feat/my-featureRelease
Create a semantic version tag
git tag -a v1.0.0 -m "Release v1.0.0"Push
Push branch and tags to remote
git push origin main --tagsCleanup
Clean up local branches
git branch -d feat/my-featuregit checkout -b feat/feature-namegit add . && git commit -m "type(scope): message"git fetch && git rebase origin/maingit checkout main && git pullgit merge --no-ff feat/feature-namegit tag -a v$(node -p "require('./package.json').version") -m "v$(node -p "require('./package.json').version")"git push origin main --tagsgit branch -d feat/feature-name