Octopus merge for multiple branches in Git - Commands & Configuration

Introduction

Sometimes you want to combine changes from many branches into one branch at once. Octopus merge lets you do this in a single step instead of merging branches one by one.

When you have multiple feature branches ready and want to merge them all into the main branch quickly.

When you want to avoid multiple merge commits cluttering your history by merging many branches at once.

When you want to test how several branches work together before finalizing the merge.

When you want to reduce the number of merge conflicts by merging all branches simultaneously.

When you want to keep your git history cleaner with fewer merge commits.

Commands

Switch to the main branch where you want to merge the other branches.

Terminal

git checkout main

Expected Output

Switched to branch 'main'

Merge multiple branches (branch1, branch2, branch3) into the current branch in one step using octopus merge.

Terminal

git merge branch1 branch2 branch3

Expected Output

Merge made by the 'octopus' strategy.

 branch1

 branch2

 branch3

Check the recent commit history to see the octopus merge commit and verify the branches merged.

Terminal

git log --oneline --graph --decorate -3

Expected Output

*   abcdef1 (HEAD -> main) Merge branches 'branch1', 'branch2', 'branch3'

|\

| * 1234567 (branch3) Commit message from branch3

| * 89abcd0 (branch2) Commit message from branch2

| * fedcba9 (branch1) Commit message from branch1

|/

* 0123456 Previous commit on main

Key Concept

If you remember nothing else from this pattern, remember: octopus merge lets you combine many branches into one commit in a single step.

Common Mistakes

Trying to octopus merge branches that have conflicts without resolving them first.

Octopus merge fails if there are conflicts between branches because it cannot automatically combine conflicting changes.

Resolve conflicts in each branch or merge branches one by one to fix conflicts before using octopus merge.

Using octopus merge with only one branch.

Octopus merge is designed for multiple branches; using it with one branch is unnecessary and behaves like a normal merge.

Use simple 'git merge branch' when merging a single branch.

Summary

Switch to the target branch where you want to merge multiple branches.

Run 'git merge' with all branch names to perform an octopus merge in one step.

Verify the merge commit in the log to confirm all branches merged together.