master
: 生产环境分支- 由
develop
分支定期发起Pull Request
并入 - 合并
Pull Request
时选择Create a merge commit
- 合并
develop
后git rebase master develop
- 由
develop
: 测试环境分支- 由
feature/...
,bugfix/...
等临时分支发起Pull Request
并入 - 合并
Pull Request
时根据分支 commit 数量选择合并方式
- 由
This repository has been archived by the owner on Mar 26, 2023. It is now read-only.