mirror of https://github.com/CrimsonTome/tldr.git
20 lines
305 B
Markdown
20 lines
305 B
Markdown
# git merge
|
|
|
|
> Merge branches.
|
|
|
|
- Merge a branch with your current branch:
|
|
|
|
`git merge {{branch_name}}`
|
|
|
|
- Edit the merge message:
|
|
|
|
`git merge -e {{branch_name}}`
|
|
|
|
- Merge a branch and create a merge commit:
|
|
|
|
`git merge --no-ff {{branch_name}}`
|
|
|
|
- Abort a merge in case of conflicts:
|
|
|
|
`git merge --abort`
|