mirror of
https://github.com/tldr-pages/tldr.git
synced 2025-07-02 04:15:24 +02:00
0e8893e1ba
Co-authored-by: Juri Dispan <juri.dispan@posteo.net> Co-authored-by: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com> Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
24 lines
521 B
Markdown
24 lines
521 B
Markdown
# 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}}`
|