Octopus merge for multiple branches in Git - Mini Project: Build & Apply

Octopus Merge for Multiple Branches

📖 Scenario: You are working on a project with multiple feature branches. You want to combine all these branches into one main branch in a single merge commit. This is called an octopus merge in Git.Imagine you have three branches named feature1, feature2, and feature3 that you want to merge into main at once.

🎯 Goal: Learn how to perform an octopus merge in Git to combine multiple branches into one merge commit on the main branch.

📋 What You'll Learn

Create three branches named feature1, feature2, and feature3 from main

Add a simple commit to each feature branch

Switch to main branch

Perform an octopus merge of feature1, feature2, and feature3 into main

Show the merge commit log

💡 Why This Matters

🌍 Real World

Octopus merges help combine many feature branches into one commit, keeping history clean and easier to understand.

💼 Career

Understanding octopus merges is useful for developers and DevOps engineers managing complex Git workflows with multiple parallel features.

1

Create three feature branches from main

Create three branches named feature1, feature2, and feature3 from the main branch using the commands git branch feature1, git branch feature2, and git branch feature3.

Git

# Create three branches from main
# Your code here

Hint

Use git branch branch_name to create a new branch from the current branch.

2

Add a commit to each feature branch

Switch to each branch feature1, feature2, and feature3 and create a new file named file1.txt, file2.txt, and file3.txt respectively. Add some text to each file, stage it, and commit with the message Update feature1, Update feature2, and Update feature3 respectively.

Git

git branch feature1
git branch feature2
git branch feature3
# Switch to feature1, create file1.txt, add text, stage and commit
# Repeat for feature2 and feature3 with file2.txt and file3.txt
# Your code here

Hint

Use git checkout branch_name to switch branches. Use echo to create files and git add and git commit to save changes.

3

Switch to main branch and perform octopus merge

Switch back to the main branch using git checkout main. Then perform an octopus merge of the three branches feature1, feature2, and feature3 into main using a single git merge command.

Git

git branch feature1
git branch feature2
git branch feature3

git checkout feature1
echo "Feature 1 work" > file1.txt
git add file1.txt
git commit -m "Update feature1"

git checkout feature2
echo "Feature 2 work" > file2.txt
git add file2.txt
git commit -m "Update feature2"

git checkout feature3
echo "Feature 3 work" > file3.txt
git add file3.txt
git commit -m "Update feature3"

# Switch to main branch
# Perform octopus merge of feature1, feature2, and feature3
# Your code here

Hint

Use git checkout main to switch back to main. Use git merge branch1 branch2 branch3 to merge multiple branches at once.

4

Show the merge commit log

Use git log --oneline -1 to display the latest commit message on the main branch. This should show the octopus merge commit.

Git

git branch feature1
git branch feature2
git branch feature3

git checkout feature1
echo "Feature 1 work" > file1.txt
git add file1.txt
git commit -m "Update feature1"

git checkout feature2
echo "Feature 2 work" > file2.txt
git add file2.txt
git commit -m "Update feature2"

git checkout feature3
echo "Feature 3 work" > file3.txt
git add file3.txt
git commit -m "Update feature3"

git checkout main
git merge feature1 feature2 feature3

# Show the latest commit log
# Your code here

Hint

The output should show a merge commit message mentioning all three branches.

Practice

1. What is the main purpose of an octopus merge in Git?

easy

A. To delete multiple branches at once

B. To merge multiple branches into one single merge commit

C. To create multiple branches from one branch

D. To rebase multiple branches onto a single branch

Solution

1. Step 1: Understand what octopus merge does

   An octopus merge is a special Git merge that combines more than two branches into a single merge commit.

2. Step 2: Compare with other Git operations

   Deleting branches, creating branches, or rebasing are different Git operations and not related to octopus merge.

3. Final Answer:

   To merge multiple branches into one single merge commit -> Option B

4. Quick Check:

   Octopus merge = multiple branches merged at once [OK]

Hint: Octopus merge = many branches combined in one commit [OK]

Common Mistakes:

• Confusing octopus merge with branch deletion
• Thinking octopus merge creates branches
• Mixing octopus merge with rebase

2. Which of the following is the correct syntax to perform an octopus merge of branches feature1, feature2, and feature3 into the current branch?

easy

A. git merge feature1 feature2 feature3

B. git merge --octopus feature1 feature2 feature3

C. git merge -m feature1 feature2 feature3

D. git merge --all feature1 feature2 feature3

Solution

1. Step 1: Recall the syntax for octopus merge

   Git automatically performs an octopus merge when you list multiple branches in a single git merge command without extra flags.

2. Step 2: Analyze the options

   git merge feature1 feature2 feature3 correctly lists branches after git merge. Options A, B, and D use invalid or non-existent flags.

3. Final Answer:

   git merge feature1 feature2 feature3 -> Option A

4. Quick Check:

   Multiple branches after git merge = octopus merge [OK]

Hint: List branches after git merge for octopus merge [OK]

Common Mistakes:

• Adding non-existent flags like --octopus
• Using -m which is for commit message
• Trying --all which merges all branches (not valid)

3. Given the following commands executed in a Git repository:

git checkout main
git merge featureA featureB featureC

What will be the result if there are no conflicts between the branches?

medium

A. Three separate merge commits, one for each feature branch

B. An error because multiple branches cannot be merged at once

C. A rebase of featureA, featureB, and featureC onto main

D. A single merge commit combining featureA, featureB, and featureC into main

Solution

1. Step 1: Understand the merge command with multiple branches

   When merging multiple branches at once, Git performs an octopus merge, creating one merge commit combining all branches.

2. Step 2: Consider conflict status

   Since there are no conflicts, the merge will succeed and produce a single merge commit.

3. Final Answer:

   A single merge commit combining featureA, featureB, and featureC into main -> Option D

4. Quick Check:

   No conflicts + multiple branches = one octopus merge commit [OK]

Hint: No conflicts + multiple branches = one merge commit [OK]

Common Mistakes:

• Expecting multiple separate merge commits
• Confusing merge with rebase
• Thinking Git errors on multiple branch merge

4. You try to run git merge featureX featureY featureZ but get a conflict error. What is the best way to fix this?

medium

A. Manually resolve conflicts in files, then run git commit

B. Abort the merge and delete all feature branches

C. Run git merge --abort and try merging branches one by one

D. Force the merge with git merge --force

Solution

1. Step 1: Understand conflict in octopus merge

   Octopus merges fail if any branch conflicts. You cannot force merge with a flag.

2. Step 2: Resolve conflicts by merging branches individually

   Abort the failed octopus merge, then merge branches one by one to resolve conflicts stepwise.

3. Final Answer:

   Run git merge --abort and try merging branches one by one -> Option C

4. Quick Check:

   Conflicts in octopus merge? Abort and merge individually [OK]

Hint: Abort and merge branches one by one to fix conflicts [OK]

Common Mistakes:

• Trying to force merge with non-existent --force flag
• Deleting branches instead of resolving conflicts
• Committing without resolving conflicts

5. You want to merge four feature branches (feat1, feat2, feat3, feat4) into develop using an octopus merge. However, feat3 conflicts with feat4. What is the best strategy to successfully merge all branches?

hard

A. Rebase feat4 onto feat3, resolve conflicts, then merge all branches into develop

B. Merge all four branches at once ignoring conflicts

C. Delete feat3 and feat4 to avoid conflicts

D. Merge feat1 and feat2 first, then merge feat3 and feat4 separately resolving conflicts, finally merge all into develop

Solution

1. Step 1: Understand conflict between feat3 and feat4

   Since feat3 and feat4 conflict, merging them directly in an octopus merge will fail.

2. Step 2: Rebase feat4 onto feat3 to resolve conflicts first

   Rebasing feat4 onto feat3 lets you fix conflicts in feat4 branch before merging.

3. Step 3: Merge all branches into develop after conflict resolution

   After rebasing and resolving conflicts, you can safely perform an octopus merge into develop.

4. Final Answer:

   Rebase feat4 onto feat3, resolve conflicts, then merge all branches into develop -> Option A

5. Quick Check:

   Resolve conflicts by rebasing conflicting branches first [OK]

Hint: Rebase conflicting branches first, then octopus merge [OK]

Common Mistakes:

• Trying to merge all at once ignoring conflicts
• Deleting branches instead of resolving conflicts
• Merging conflicting branches separately without rebasing