mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-01-26 11:33:59 +00:00
30 lines
614 B
Plaintext
30 lines
614 B
Plaintext
---
|
|
syntax: markdown
|
|
tags: [tldr, common]
|
|
source: https://github.com/tldr-pages/tldr.git
|
|
---
|
|
# git merge
|
|
|
|
> Merge branches.
|
|
> More information: <https://git-scm.com/docs/git-merge>.
|
|
|
|
- Merge a branch into your current branch:
|
|
|
|
`git merge {{branch_name}}`
|
|
|
|
- Edit the merge message:
|
|
|
|
`git merge {{[-e|--edit]}} {{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`
|
|
|
|
- Merge using a specific strategy:
|
|
|
|
`git merge {{[-s|--strategy]}} {{strategy}} {{[-X|--strategy-option]}} {{strategy_option}} {{branch_name}}`
|