Practice · 1 of 3
Conflict Parser
A conflicted file contains lines <<<<<<< HEAD, =======, >>>>>>> other. Write parseConflict(text) returning { mine, theirs } — the lines between the markers, joined with "\n" (mine = HEAD side, theirs = the other side). Assume exactly one conflict block.
Difficulty: intermediate
Press Submit to check your solution.
Back to lesson: Practice: Conflict Resolution — Practice