markdown 简化的Git流程

Posted

tags:

篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了markdown 简化的Git流程相关的知识,希望对你有一定的参考价值。

# Simplified Git-flow

```
                        RELEASE TAG
o----------------------------o-----------------o------------o------> MASTER
 \                          /  \                \----------/ HOTFIX
  \                        /    \                          \
   \----------------------/      \--------------------o-----o------> DEVELOP
                                  \                  /
                                   \----------------/ FEATURE

```

- `Master`: should contain the most stable, production ready code. In other words, we can pull from master and build and deploy at anytime.
- `Develop`: is where most of the development happen. After code in `Develop` stable enough, it can be merged back to `Master`. Every release should be tagged (Ex: version 2.1.3). 
- `Feature`: is where each feature development happens. Should be only branched from `Develop` and commited back to `Develop`. After fully merged to `Develop`, individual `Feature` branch can be deleted.
-  `Hotfix`: is where we do bug fix in current release. After finish fixing the bug, `Hotfix` get merged to both `Master` and `Develop`, then it can be deleted.

#### Naming convention:

- `Feature`: prefix with `feature_` and then a short descriptive name (Ex: `feature_new_mission`).
- `Hotfix`: prefix with `hotfix_` and then a short descriptive name (Ex: `hotfix_duplicate_mission`).


Read more:

[StackOverflow](https://stackoverflow.com/questions/18188492/what-are-the-pros-and-cons-of-git-flow-vs-github-flow), [Gist](https://gist.github.com/jbenet/ee6c9ac48068889b0912)

以上是关于markdown 简化的Git流程的主要内容,如果未能解决你的问题,请参考以下文章

markdown git,PR流程

markdown Git工作流程

markdown Git工作流程

markdown 日常工作流程中常见的git命令

markdown 日常工作流程中常见的git命令

markdown 日常工作流程中常见的git命令