Rebase Feature Branch

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.

---

📹 Video Solution