⚡ ~/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 39 of 52 in Git & Branching Workflows
Senior DevOps / SRE [L2] Git resolve conflicts, then: Production Scenario [L2]
🎯 Target Role / Context: Git Scenario #39 (L2) · resolve conflicts, then:

Q: Two developers merge different image files (PNG) with the same filename. Git reports a binary conflict. How do you resolve it?

Git can't merge binary files — there's no line-by-line diff. When both branches modify the same binary file, Git marks it as conflicted and keeps both versions accessible:.

#Git #L2 #Version Control #Collaboration
🎙️ Candidate Opening & Architectural Context
""During a major release branch cut, we encountered this exact scenario and used Git internals to recover cleanly. The interviewer is testing: Handling binary file conflicts, custom merge drivers.. 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: "During a major release branch cut, we encountered this exact scenario and used Git internals to recover cleanly. The interviewer is testing: Handling binary file conflicts, custom merge drivers.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third."

1️⃣

Initial Diagnostics & Root Cause Analysis

Git can't merge binary files — there's no line-by-line diff. When both branches modify the same binary file, Git marks it as conflicted and keeps both versions accessible:

  • Git LFS with file locking — git lfs lock assets/logo.png prevents concurrent edits to binary files. Others see the file as locked and coordinate.
  • Custom merge drivers in .gitattributes — you can define how specific file types are merged:
2️⃣

Remediation & Permanent Safeguards

After choosing, stage and commit: If you need to compare both versions before deciding: Open both files, decide which to keep (or combine them in an image editor), replace the conflicted file, and stage it. Prevention strategies: merge=ours automatically keeps the current branch's version for .psd files, avoiding conflicts entirely (with the tradeoff of silently ignoring the other side's changes).

git checkout --ours -- assets/logo.png    # keep your version
git checkout --theirs -- assets/logo.png  # keep their version
💡 The Senior SRE Gold Nugget (Key Architectural Takeaway)
"Pro-Tip: Git LFS with file locking — git lfs lock assets/logo.png prevents concurrent edits to binary files. Others see the file as locked ."
⚡ 60-Second Elevator Pitch Talking Points
  • Git LFS with file locking — git lfs lock assets/logo.png prevents concurrent edits to binary file...
  • Custom merge drivers in .gitattributes — you can define how specific file types are merged:
⛔ 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 developers merge different 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 developers merge different 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 developers merge different 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 developers merge different 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 →