Settle a Config Conflict
You raised the request timeout on main. A teammate raised the retry count on feature/retries, editing the very same line of config.js. Both changes are right.
Your mission
Merge feature/retries into main so that config.js keeps both changes, a timeout of 30 and 3 retries, with the merge finished and nothing left uncommitted.
No steps and no hints here: GitDojo checks the repository after every command and edit, whichever way you get there.
Setting up the repository…
Want the guided version? Resolve Your First Conflict
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.