JAEN

Git

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
Complete the merge (or --abort to start over)--abort returns you to the pre-merge state.
See the whole flow →

Related commands

The same reference, with no signal at all

Every command on this site, held on your device. The app adds 632 more: 1,510 commands and 120 fix flows, searchable with no connection. Free to install, no ads (some content is a one-time purchase).

Get it free on the App Store