RivoCode

Git & GitHub · Branching & Merging · Lesson 6 of 11

Merging Branches

Concept

Merging Branches

git merge combines the changes from one branch into another, usually merging a feature branch back into main.

By the end of this lesson
  • Explain the core idea behind Merging Branches.
  • Predict output before running a change.
  • Test one realistic and one unusual input.
  • Use the result to make the next decision.
How to study this page
  1. 1. Read one concept.
  2. 2. Change the example.
  3. 3. Run, compare, and explain.
  4. 4. Complete the challenge below.
ExampleRunnable
git checkout main
git merge feature-navbar
Try it Yourself »
Self-check before continuing

Without looking at the example, describe what changes when you modify one input in Merging Branches. Then reopen the editor and prove your explanation with a small test.

You are ready to continue when you can predict, test, and explain the result.

Your turn

Explain why you switch to main before running git merge.

Loading editor…

Console

Output will appear here...