CmdID

CmdID / Commands

git-merge

Merge branches. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Merge branches into the current branch

git merge branch_name1 branch_name2 ...Identify

Edit the merge message

git merge --edit branch_nameIdentify

Merge a branch and create a merge commit

git merge --no-ff branch_nameIdentify

Stage the result of merging a branch without creating a commit

git merge --squash branch_nameIdentify

Abort a merge in case of conflicts

git merge --abortIdentify

Merge using a specific strategy

git merge --strategy strategy --strategy-option strategy_option branch_nameIdentify