Branching, merging, versioning, and release conventions for the Gitflow workflow, covering main/develop branches, feature/release/hotfix branches, semantic versioning, and pull request rules. Use when creating a branch, naming a branch, planning a release or hotfix, writing a commit message, or setting up branch protection for a repository that follows Gitflow.
79%
Does it follow best practices?
Run evals on this skill
Adds up to 20 points to the overall score
Passed
No findings from the security scan
Fix and improve this skill with Tessl
tessl review fix ./gitflow/SKILL.mdThis skill covers the Gitflow branching model: the two long-lived branches, the three supporting branch types, commit message conventions, semantic versioning, and the release and hotfix processes.
git checkout develop && git pull origin develop so the feature branches from the latest development state.git checkout -b feature/123-user-authentication, using the naming convention feature/[issue-id]-descriptive-name.type(scope): description for every commit (see Commit Messages below).git fetch origin && git rebase origin/develop (or merge, per team convention).develop.git branch -d feature/123-user-authentication && git push origin --delete feature/123-user-authentication.main.hotfix/* branches or release/* branches.git tag -a v1.2.0 -m "Release 1.2.0").feature/* branches.develop — all changes land through pull requests.develop.develop.feature/[issue-id]-descriptive-name (e.g. feature/123-user-authentication).develop before opening a PR.develop.main and develop.release/vX.Y.Z (e.g. release/v1.2.0).main.main and develop.hotfix/vX.Y.Z (e.g. hotfix/v1.2.1).Use Conventional Commits format: type(scope): description.
| Type | Meaning |
|---|---|
feat | New feature |
fix | Bug fix |
docs | Documentation changes |
style | Formatting, missing semicolons, etc. — no logic change |
refactor | Code restructuring without behavior change |
test | Adding or correcting tests |
chore | Maintenance tasks (build scripts, dependency bumps) |
Example:
feat(auth): add refresh-token rotation
fix(orders): prevent duplicate charge on retry
chore(deps): bump lodash to 4.17.21Given a version MAJOR.MINOR.PATCH:
main or develop.main, develop).Apply to both main and develop:
develop: git checkout -b release/v1.2.0 develop.main.main:
git tag -a v1.2.0 -m "Release 1.2.0" and push the tag.main back into develop so develop has the release commit and tag.main: git checkout -b hotfix/v1.2.1 main.main.main:
git tag -a v1.2.1 -m "Hotfix 1.2.1" and push the tag.main back into develop so the fix isn't lost in the next release.Mindrally/skills
gitflow/SKILL.md
7682ca7
If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.