Scenario

A Git repository at /home/interview/repo has a feature branch feature-login with several commits, but it was created from the wrong base branch.

Task

Rebase feature-login onto develop (it's currently based on main) while preserving all commits.

Example

# Before (feature branched from main)

* d7e8f9a (develop) Configure database settings
| * c2d3e4f (HEAD -> feature-login) Implement form validation
| * a9b0c1d Create login component
|/
* 3f4a5b6 (main) Initialize repository

# After (feature rebased onto develop)

* m8n9o0p (HEAD -> feature-login) Implement form validation
* k6l7m8n Create login component
* d7e8f9a (develop) Configure database settings
* 3f4a5b6 (main) Initialize repository

Step 1: Navigate to the repository and check branch structure

cd /home/interview/repo
git log --oneline --graph --all

View branches to confirm feature-login is based on main instead of develop.

Step 2: Switch to the feature branch

git checkout feature-login

Step 3: Rebase onto develop

git rebase develop

Replay feature-login commits on top of develop.

Step 4: Verify the rebase succeeded

git log --oneline --graph --all

Feature-login should now branch from develop with all commits preserved.