Scenario:

You have a Git repository at /home/interview/repo on the main branch. A commit on the feature branch contains a bug fix you need on main, but you don't want to merge the entire feature branch.

Task:

Navigate to /home/interview/repo, identify the bug fix commit on the feature branch from the commit history, then apply it to main.

Step 1: Navigate to the repository and check current branch

cd /home/interview/repo
git branch

Confirm you're on the main branch.

Step 2: View feature branch commits

git log feature --oneline

Locate the bug fix commit hash (e.g., a1b2c3d) by looking for the commit message containing "Bug fix".

Step 3: View commit details

git show <hash>

Replace <hash> with the actual commit hash you identified and see what changes are in that specific commit.

Step 4: Cherry-pick the commit to main

git cherry-pick <hash>

Replace <hash> with the actual commit hash from Step 2. And apply the bug fix commit from feature branch to main. Ensure your working tree is clean before cherry-picking.