MergingintermediatePractice
Merge a Finished Feature
feature/search is reviewed and approved. Meanwhile main gained a footer, so the two branches have each moved on since they split. You are on feature/search.
Your mission
Bring all of feature/search into main, keeping main's footer, and end up on main.
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? Merge Feature Into Main
Preparing your workspace…
Repository Graph
Click a commit to inspect it
0 commits
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.