# gitflow

**Repository Path**: dormi330/gitflow

## Basic Information

- **Project Name**: gitflow
- **Description**: git 分支模型
- **Primary Language**: Java
- **License**: MIT
- **Default Branch**: master
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 0
- **Forks**: 0
- **Created**: 2018-03-31
- **Last Updated**: 2020-12-19

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## README

# gitflow
git 分支模型

# step 1
- 目的：初始化 master 分支
- 动作：添加pom.xml，修改.gitignore
```
git add -A && git commit -m "init project"
git push
```

# 创建 develop分支

- 添加 java代码 `org.wzq.learn.Demo1`
- 修改 pom.xml文件
- 执行
```
mvn clean package
java -jar target/Demo1.jar
```

- git 流程处理
这个做为master的第一次合并

```
git checkout -b develop master

# java代码，pom文件...
git add -A && git commit -m "基础功能完成1"
git push --set-upstream origin develop
git checkout master
git merge --no-ff develop
git tag -a v1.0.0
git push --tags
```

# 创建 feature分支
- 创建 feature-hello分支
```
git checkout develop
git merge master # 确保develop是从master过来
git checkout -b feature-hello develop

# 修改，提交 确保在 feature-hello分支上
git add -A && git commit -m "feature-hello"
# 修改，提交 确保在 feature-hello分支上
git add -A && git commit -m "feature-hello2"

```
- feature分支并到 develop分支
```
git checkout develop
git merge feature-hello
git add -A && git commit -m "feature-hello 合并完成"
```

- develop合并到master，并发布tag
```
git checkout master
git merge --no-ff develop
git tag -a "v1.1.0" -m "添加功能，次版本号+1"
git push --tags
```

# 创建 hotfix分支

```
git checkout -b hotfix-petStore master
# 修改 Demo1.java, README.md
git add -A && git commit -m "hotfix petStore"
git push --set-upstream origin hotfix-petstore
```
# master合并 hotfix分支

```
git checkout master
git merge --no-ff feature-petStore
git add -A && git commit -m "hotfix petStore"
git tag -a "v1.1.1" -m "修改bug, build号加1"
git push --tags
```