Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
git-tools
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
common-tools
git-tools
Commits
1a436f0e
Commit
1a436f0e
authored
Jul 31, 2018
by
huasheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update readme
parent
219ac621
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
.README.md.swp
.README.md.swp
+0
-0
README.md
README.md
+2
-2
No files found.
.README.md.swp
deleted
100644 → 0
View file @
219ac621
File deleted
README.md
View file @
1a436f0e
...
@@ -7,7 +7,7 @@
...
@@ -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环境的部署
提供了方便的分支合并以及向远端仓库推送的命令集合,工作中常见的场景为:提测阶段,需要将开发分支合并到testing分支,然后进行QA环境的部署
##### 参数
##### 参数
-
targe_branch
-
targe_branch
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
sh git_merge_bransh.sh testing 1
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的污染,向master合并分支的时候,最好将自己的开发分支的commit进行一些合并,这个工具可以方便的实现这点
原理也很简单:
原理也很简单:
-
先从主干master分支切出一个新的分支,命名规则为 当前分支名 + '_merge'
-
先从主干master分支切出一个新的分支,命名规则为 当前分支名 + '_merge'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment