A merge conflict discovered in critical code right before a deployment calls for pausing the release and resolving the conflict collaboratively, rather than letting one person guess and rush the merge through under time pressure.
Key Points: • Pause the deployment first; shipping under a deadline with an unresolved conflict risks a much worse production incident than a delayed release. • Bring together the developers whose changes are conflicting, since they understand the intent behind each side better than anyone resolving it alone. • Resolve the conflict together, choosing or combining the correct logic rather than arbitrarily picking one side to save time. • Run the full test suite on the merged result, not just a quick manual check, since the deployment deadline makes it tempting to skip validation. • After the deployment succeeds, review why the conflict wasn't caught earlier, since it usually points to a process gap like infrequent integration.
Example: Two developers' changes to the same payment validation method conflict the night before a release; the team pauses the deploy, walks through both changes together, merges the correct combined logic, runs the full regression suite, and only then proceeds.
Interview Tip: A concise interview answer is:
"I'd pause the deployment rather than rush a guess through under pressure. The developers whose changes conflict work through it together, we run the full test suite on the merged result, and only then proceed, followed by a quick look at why the conflict wasn't caught earlier."