tldr-pages/tldr
1
1
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2024-10-06 00:07:20 +03:00
Code Issues Packages Projects Releases Wiki Activity
kant-patch-1
tldr/pages/common/git-merge.md
Gonzalo Matheu 3d5d15621b
git-merge: update page (#10232) 
* git-merge: Added merge with strategy options

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>

* git-merge: -e to --edit

---------

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>
Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
2023-05-19 09:33:57 +05:30

494 B
Raw Permalink Blame History

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 --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 --strategy {{strategy}} --strategy-option {{strategy_option}} {{branch_name}}