gitflow

• petervanderdoes/gitflow-avhGitHubpetervanderdoes/gitflow-avhpetervanderdoes/gitflow-avh · 2019 停止维护 · a collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.笔记：gitflow
  • 2019 停止维护
  • a collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
  • adds more functionality to the existing git-flow and several of the internal commands have been rewritten to speed up the software.
• nvie/gitflowGitHubnvie/gitflowpetervanderdoes/gitflow-avh · 2019 停止维护 · a collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.笔记：gitflow
  • 2012 停止维护
• A successful Git branching model
• git-flow 工作流程
• branches
  • bugfix hotfix release feature support
• actions
  • delete finish list publish rename start track
  • rebase

brew install git-flow-avh

git flow init -d
git push --set-upstream origin develop

git checkout develop
git flow release start v2021.1.1
git flow release finish v2021.1.1
git push --tags

standard

• 单分支 - GitHub flow
  • master
• 功能分支
  • master, feature/*
  • feature/* -> master
• gitflow
  • master, develop, feature/*, release/*,hotfix/*
  • release/*, hotfix/* -> master
  • feature/*, release/*, hotfix/* -> develop
• GitLab
  • master, feature/*, *-stable, env/*
  • feature/* -> master

---
title: GitFlow
---
gitGraph
   commit id: "初始化"
   commit id: "基础主线"
   branch develop
   commit id: "基础功能"
   branch feature/a

   checkout feature/a
   commit id: "功能 A"
   checkout develop
   merge feature/a
   commit id: "Merge A"

   branch release/v1
   checkout release/v1
   commit id: "V1"
   checkout develop
   merge release/v1
   checkout main
   merge release/v1
   commit id: "v1"

   checkout main
   branch hotfix/x
   commit id: "fix x"
   checkout main
   merge hotfix/x
   checkout develop
   merge hotfix/x

---
title: GitLab
---
gitGraph
   commit id: "初始化"
   commit id: "基础主线"
   branch develop
   commit id: "基础功能"
   branch feature/a

   checkout feature/a
   commit id: "功能 A"
   checkout develop
   merge feature/a
   commit id: "Merge A"

   branch env/staging
   commit
   commit id: "fixing A"
   branch env/pre-prod
   commit id: "v1"
   branch env/production
   commit

• docs.github.com/en/get-started/quickstart/github-flow
  • frequently deploying
  • minimize the amount of unreleased code
• docs.gitlab.com/ee/topics/gitlab_flow.html
• Wikipedia:Feature-driven developmentWikipediaFeature-driven development
• martinfowler.com/bliki/FeatureBranch.html
• 操作规范
  • rebase
  • squash