Quick Actions
git merge
Description
Join two or more development histories together.
Command
git mergeExamples
Merge branch
git merge feature-branchNo fast-forward merge
git merge --no-ff feature-branchSquash merge
git merge --squash feature-branchParameters
| Parameter | Type | Required | Description |
|---|---|---|---|
--no-ff |
string | No | Create merge commit even if fast-forward possible |
--squash |
string | No | Squash commits into single commit |
--abort |
string | No | Abort the merge process |
--continue |
string | No | Continue after resolving conflicts |
Command Info
Category:
Merging
Type:
Git
Views:
7
Status:
Active
Tags
merge
combine
integration