Commit 1a436f0e authored by huasheng's avatar huasheng

update readme

parent 219ac621
......@@ -7,7 +7,7 @@
### 详解
#### git_merge_branch.sh <target_branch> <need_push_after_merge>
#### git_merge_branch.sh [target_branch] [need_push_after_merge]
提供了方便的分支合并以及向远端仓库推送的命令集合,工作中常见的场景为:提测阶段,需要将开发分支合并到testing分支,然后进行QA环境的部署
##### 参数
- targe_branch
......@@ -22,7 +22,7 @@
sh git_merge_bransh.sh testing 1
```
#### git_submit_merge_request.sh <merge_comment>
#### git_submit_merge_request.sh [merge_comment]
当项目发布的时候,为了避免对主干master的污染,向master合并分支的时候,最好将自己的开发分支的commit进行一些合并,这个工具可以方便的实现这点
原理也很简单:
- 先从主干master分支切出一个新的分支,命名规则为 当前分支名 + '_merge'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment