The Merge Battle

📁 Files

src/cart.js!M

! ConflictS StagedM ModifiedU Untracked

No files staged. Use git add to stage changes.

📊 Commit Graphcurrent branchmain

📐 Rebase AcademyAdvanced0/4

📖 Concepts

RebaseRe-applies commits from your current branch on top of another branch. Creates a linear history instead of a merge commit.

Linear HistoryA commit graph with no branching/merging — every commit has one parent. Easier to read and bisect.

Rebase vs MergeMerge preserves the full branch structure. Rebase rewrites commits for a cleaner, linear history. Both produce the same final content.

Understand the situation

Feature branch started from the same base as main, but has different commits. Check the log to see.

● Understand the situation

○ Rebase feature onto main

○ Check the linear history

○ Merge feature into main (fast-forward)

🧩 The Merge BattleUnsolved

📖 Story

Two teammates worked in parallel: - feature/pricing added a price calculation to src/cart.js - feature/tax added tax logic to the same function Both branches need to be merged into main. The first merge went fine. The second one conflicts. Resolve the conflict by keeping BOTH the pricing logic AND the tax logic in the final file.

Goal

Solve the problem by using the correct Git commands.

Terminal

🧩 Problem: The Merge Battle

Merge two branches that both modified the same files. Keep the right changes from each side.

Use the terminal to solve the problem. Results are checked automatically.