⚡ ~/naveed Interview Prep
⚡ Portfolio Home 👤 About Naveed Bio & Credentials 📫 Contact Naveed Get In Touch ✍️ Engineering Blog Deep Dives 🎯 Interview Hub 1,000+ Scenarios ☸️ Kubernetes Mastery Hub 24 Modules 🎮 DevOps Arcade & Quizzes Subnet Blitz ⚡ 🗺️ DevOps Roadmaps PDFs & Guides 🤖 Morpheus Analysis AI Quant ↗ 🛠️ Developer Tools Utilities 🧪 Labs & Experiments 📄 Interactive CV & Certs 🔗 All Links & Socials ⚡ Join The Dispatch (Weekly SRE Newsletter) →
← Back to All Git & Branching Workflows Interview Questions Scenario 1 of 52 in Git & Branching Workflows
Junior / Associate DevOps [L1] Git Branching, Merging & Conflicts Core Fundamentals [L1]
🎯 Target Role / Context: Git Scenario #1 (L1) · Branching, Merging & Conflicts

Q: You started coding directly on `main` and made three commits. You realize this work belongs on a feature branch and you haven't pushed yet. How do you move those commits to a new branch and clean up `main`?

A branch in Git is just a pointer to a commit, so "moving" commits is really just moving pointers around.

#Git #L1 #Version Control #Collaboration
🎙️ Candidate Opening & Architectural Context
""In a fast-paced team with dozens of pull requests merged daily, Git workflow hygiene was critical. The interviewer is testing: Basic branch mechanics, understanding that branches are just movable pointers to commits.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.""
Advertisement
⚡ Recommended Practice Lab

Want to master this scenario in a live sandbox? KodeKloud's Advanced Git Workflows, Rebase & Interactive Diagnostics covers this exact problem with hands-on terminal drills.

🛠️ Production Runbook & Step-by-Step Resolution

Direct Answer: "In a fast-paced team with dozens of pull requests merged daily, Git workflow hygiene was critical. The interviewer is testing: Basic branch mechanics, understanding that branches are just movable pointers to commits.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third."

1️⃣

Initial Diagnostics & Root Cause Analysis

A branch in Git is just a pointer to a commit, so "moving" commits is really just moving pointers around.

  • Create the feature branch from where you are right now — this captures your three commits on the new branch:
  • Reset main back to where the remote is — your local main still points at the third commit; rewind it:
  • Switch to the feature branch and continue:
2️⃣

Remediation & Permanent Safeguards

The order matters: create the new branch *before* you reset, otherwise the commits become unreachable from any branch (they'd still be in reflog for ~90 days, but don't rely on that). Since you never pushed, no one else is affected.

git branch feature/my-work
💡 The Senior SRE Gold Nugget (Key Architectural Takeaway)
"Pro-Tip: Create the feature branch from where you are right now — this captures your three commits on the new branch:."
⚡ 60-Second Elevator Pitch Talking Points
  • Create the feature branch from where you are right now — this captures your three commits on the ...
  • Reset main back to where the remote is — your local main still points at the third commit; rewind...
  • Switch to the feature branch and continue:
⛔ Critical Candidate Mistakes to Avoid in This Scenario

Senior hiring managers and bar raisers evaluate how you prioritize during outages. Avoid these common anti-patterns:

  1. Running raw git push --force rather than git push --force-with-lease on shared team feature branches when configuring started coding directly git push --force unconditionally overwrites remote commits made by teammates, whereas --force-with-lease aborts if the remote ref was updated.
  2. Resolving complex merge conflicts with blind checkout overwrite strategies without running unit tests when configuring started coding directly Unilateral conflict resolution frequently clobbers complementary logic introduced in parallel feature branches, creating regression bugs.
  3. Discarding corrupted working directories prematurely instead of recovering lost state using git reflog when configuring started coding directly git reflog tracks every HEAD movement, allowing instant recovery of discarded commits, botched rebases, or deleted local branches.
  4. Disabling branch protection rules and mandatory PR approval reviews on shared release branches when configuring started coding directly Without branch protection, developers can bypass CI validation gates and push untested code directly to production branches.
Advertisement
Want more Git & Branching Workflows scenarios?
Explore our complete collection of scenario-based Git & Branching Workflows interview runbooks.
Browse All Git & Branching Workflows Questions →