git merge
CautionMerge
git merge <branch>
Integrates a branch into the current one.
Examples
git merge --no-ff feature/xKeep a merge commit
Syntax
git merge <branch> [--no-ff]
Before you run it
May require conflict resolution.
Used when you see
Merge conflict
4
See the whole flow →Complete the merge (or --abort to start over)--abort returns you to the pre-merge state.
Related commands
- git branchBranches
The same reference, with no signal at all
Every command and flow from this site, held on your device and searchable with no connection. Free to install, no ads.
Get it free on the App Store