Challenge
intermediateMerge Conflict
Scenario
The release/2.0 branch moved the API to a new host and updated the setup guide. Meanwhile main raised the request timeout on the same line, and deleted the setup guide because the README now covers it.
You are on release/2.0, about to ship it.
Mission
Bring release/2.0 into main with a merge commit. Keep the new host and the longer timeout, decide what happens to the setup guide, and finish on main with nothing left uncommitted.
Objectives
0/4- You are on
main, the branch receiving the release. (Current objective) - Every conflict is resolved, including what happens to
docs/setup.md. (Not started) mainhas a merge commit bringing inrelease/2.0. (Not started)- The working tree is clean. (Not started)
Your task nowStep 1 of 4
You are on main, the branch receiving the release.
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.