⌘K

git merge

all

Merge branches.

Options (3)

-e, --editboolean

Edit the merge message

Example: git merge {{[-e|--edit]}} {{branch_name}}

-s, --strategyboolean

Merge using a specific strategy

Example: git merge {{[-s|--strategy]}} {{strategy}} {{[-X|--strategy-option]}} {{strategy_option}} {{branch_name}}

-X, --strategy-optionboolean

Merge using a specific strategy

Example: git merge {{[-s|--strategy]}} {{strategy}} {{[-X|--strategy-option]}} {{strategy_option}} {{branch_name}}

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