Practice · 2 of 3

Clean Resolver

CHALLENGE

Difficulty: intermediate+25 XP

Write resolveConflictFile(text, chosen) where chosen is "mine" or "theirs": return the file with the conflict block replaced by the chosen side's lines — markers removed, surrounding context preserved exactly.

Press Submit to check your solution.

Back to lesson: Practice: Conflict Resolution — Practice