50+ Production Git & Branching Workflows Interview Questions & Scenarios (2026 Edition)

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`?

\"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.\" Key Takeaway: Pro-Tip: Create the feature branch from where you are right now — this captures your three commits on the new branch:.

Q: What is the difference between `git clone` and `git fork`, and when would you use each in practice?

\"When an engineer accidentally creates this branch or commit divergence, I walk them through safe recovery without data loss. The interviewer is testing: Understanding of remote workflows and contribution models.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.\" Key Takeaway: Pro-Tip: Clone (git clone ) — downloads a copy of a repo to your laptop. You get the full history and a remote called origin pointing back .

Q: You ran `git merge` and Git stopped with conflicts in three files. Walk me through exactly how you resolve them, and explain what the conflict markers mean.

\"During a major release branch cut, we encountered this exact scenario and used Git internals to recover cleanly. The interviewer is testing: Practical conflict resolution, understanding of three-way merge.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.\" Key Takeaway: Pro-Tip: See what's conflicted:.

Q: When should you use `git rebase` instead of `git merge`, and what is the one rule you must never break?

\"Git is an immutable directed acyclic graph (DAG); knowing commands like git reflog means you never truly lose commits. The interviewer is testing: Workflow tradeoffs, understanding the danger of rewriting shared history.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.\" Key Takeaway: Pro-Tip: Merge preserves the actual branching history (creates a merge commit). Good for main/release branches where the history of *when t.

Q: You have local changes in your working directory that you don't want anymore. How do you discard them, and what's the difference between discarding tracked vs untracked changes?

\"In a fast-paced team with dozens of pull requests merged daily, Git workflow hygiene was critical. The interviewer is testing: Understanding of the working tree, staging area, and untracked files.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.\" Key Takeaway: Pro-Tip: Modified tracked files (not staged): git restore (or older syntax git checkout -- ) reverts the file to what's in HEAD..

Junior / Associate DevOps [L1] Branching, Merging & Conflicts

⚡ Scenario git-q001-you-started-coding-directly-on-main

Git Q1: You started coding directly on main and made three commits You realize this work belongs on a feature branch and you havent pushed yet How do you move those commits to a new branch and clean up main [L1]

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

#Git #Branching, Merging & Conflicts #L1

All Git & Branching Workflows Scenario Questions (50)