Scenario:

You have a Git repository at /home/interview/repo where your feature-payment branch is 32 commits behind main. You need to rebase the feature branch onto the latest main and resolve conflicts that occur during the process.

Task:

Navigate to /home/interview/repo, rebase feature-payment onto main, resolve any conflicts that arise, and verify the feature branch is now based on the latest main with all feature commits preserved.

Step 1: Navigate to the repository and check current branch

cd /home/interview/repo
git branch

Verify which branch you're on.

Step 2: Switch to feature branch

git checkout feature-payment

Switch to the branch that needs rebasing.

Step 3: View feature commits before rebasing

git log --oneline main..feature-payment

See your feature commits that will be replayed on top of main.

Step 4: Start the rebase

git rebase main

Replays your commits one at a time on top of main. If conflicts occur, Git pauses and shows:

CONFLICT (content): Merge conflict in <file>
error: could not apply <commit>...

Step 5: Resolve conflicts (if they occur)

git status

View which files have conflicts. Edit each file, look for conflict markers:

<<<<<<< HEAD (main's version)
=======
>>>>>>> commit message (your version)

Choose which code to keep, remove markers, and save.

Step 6: Stage resolved files and continue

git add <resolved-files>
git rebase --continue

Stage the files after resolving conflicts. Repeat steps 5-6 if more conflicts occur until rebase completes. Use git rebase --abort to cancel if needed.