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 a...
#Git #resolve conflicts, then: #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
🛠️ Production Runbook & Step-by-Step Resolution
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.pngprevents 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:
Advertisement