Challenge
advancedRebase a Feature Branch
Scenario
feature/notifications was created before the latest production configuration landed on main. Its two notification commits are ready for review, but the team wants a straight history with those commits following the current tip of main.
You are on feature/notifications. Nobody has changed main locally.
Mission
Put both notification commits directly on top of the current main, keep main exactly where it is, and finish on feature/notifications with a clean working tree.
Objectives
0/6feature/notificationsis based on the currentmainwith a linear history. (Current objective)mainstill points atUpdate production region. (Not started)- The email notification commit remains on the feature branch. (Not started)
- The preferences commit remains on the feature branch. (Not started)
- You finish on
feature/notifications. (Not started) - The working tree is clean. (Not started)
Your task nowStep 1 of 6
feature/notifications is based on the current main with a linear history.
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.