Challenge
advancedResolve a Rebase Conflict
Scenario
feature/retries increased retry attempts for unreliable requests. While it was in progress, main moved production to a new region in the same settings line. The feature must now follow the current main history, and production needs both settings.
Mission
Put feature/retries on top of the current main while keeping the new region and the higher retry count in src/settings.js. Finish on the feature branch with no conflict or local change.
Objectives
0/4- The settings retain the new region and the higher retry count. (Current objective)
feature/retriesis based on the currentmainwith a linear history. (Not started)- You finish on
feature/retries. (Not started) - No conflict or working-tree change remains. (Not started)
Your task nowStep 1 of 4
The settings retain the new region and the higher retry count.
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.