https://github.com/byteszero/gitflow

SourceTree Git Flow 介绍
https://github.com/byteszero/gitflow

Last synced: about 2 months ago
JSON representation

SourceTree Git Flow 介绍

• Host: GitHub
• URL: https://github.com/byteszero/gitflow
• Owner: BytesZero
• Created: 2021-07-07T08:09:47.000Z (over 4 years ago)
• Default Branch: master
• Last Pushed: 2021-07-07T11:42:22.000Z (over 4 years ago)
• Last Synced: 2025-01-04T17:19:31.474Z (12 months ago)
• Size: 9.77 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

          
# gitflow

SourceTree Git Flow 介绍

## 什么是 Git Flow？

- 一系列 Git 命令的组合

- 建立一种规范，为了让 Git 在协作使用时更加顺畅

## 分支介绍

- `master`  主分支

- `develop` 开发分支

- `future/*` 功能分支

- `release` 预发分支

- `hotfix/*` 修复分支

- 其他辅助、临时分支

### 流程图

![Git工作流.png](https://cdn.nlark.com/yuque/0/2021/png/144369/1625644006283-aff8169d-0e32-49e9-b484-3ab936c08905.png#align=left&display=inline&height=439&margin=%5Bobject%20Object%5D&name=Git%E5%B7%A5%E4%BD%9C%E6%B5%81.png&originHeight=439&originWidth=798&size=35797&status=done&style=none&width=798)

## 冲突合并

- 尊重原则

- 不要害怕

- 测试检查