Challenge05
intermediateConflict Challenge
Scenario
feature/tax adds sales tax to the checkout. While it was being built, main got a holiday discount and a bigger cart, touching the very same lines.
Get the tax feature into main with a merge commit. Resolve every conflict so both the discount and the tax survive, and finish on main with nothing left uncommitted.
You are currently on feature/tax.
Mission
Land a feature on main through a conflicting merge, with a history that shows it.
Objectives
0/5- You are on
main, the branch receiving the work. (Current objective) - Every conflict is resolved and staged. (Not started)
feature/taxis merged intomain. (Not started)mainhas a merge commit. (Not started)- The working tree is clean. (Not started)
Your task nowStep 1 of 5
You are on main, the branch receiving the work.
Need help?
Preparing your workspace…
Repository Graph
Click a commit to inspect it
Working Tree
Not a Git repository yet
No unstaged changes
Your working tree matches the staging area.
Staging Area
Files prepared for the next commit
No staged changes
Use git add to prepare files for your next commit.
Repository
Committed history
No commits yet
Use git commit to record staged changes.