Scenario:

You have a Git repository at /home/interview/repo where you've completed work on the feature-login branch. The feature is ready to be integrated into the main branch.

Task:

Merge feature-login into main and delete the feature branch in /home/interview/repo.

Example:

# Before (feature branch exists)
$ git branch
  feature-login
* main

$ git log --oneline -1 feature-login
d4e5f6a Add login validation

# After (feature merged and branch deleted)
$ git log --oneline -1 main
d4e5f6a Add login validation

$ git branch
* main

Step 1: Navigate to the repository

cd /home/interview/repo

Navigate to the Git repository.

Step 2: View branch list with verbose

git branch -v

See branches with their latest commits.

Step 3: Check current Git status

git status

Ensure working tree is clean before merging.

Step 4: View feature-login branch commits

git log feature-login --oneline -5

See what commits will be merged.

Step 5: Check main branch log

git log --oneline -3

See current state of main before merge.

Step 6: Merge feature-login into main

git merge feature-login

Integrate feature-login commits into main.

Step 7: Verify merge succeeded

git log --oneline -5

Should show commits from feature-login now in main.

Step 8: Delete feature-login branch

git branch -d feature-login

Delete the feature branch (safe delete - prevents deleting unmerged branches).