Fig 5Conflicts — two answers for one placeClick to merge, then resolveapart
A wagon from main and a wagon from featBoth changed the same line, so both claim the berthThe lamp is red while git waits for a personThe tool is your edit: you rewrite one wagonA conflict is not a fault in git. It happens when two branches change the same line, so git has two answers for one place and cannot choose. Git stops, marks the place in the file, and waits. You edit the file to the answer you want, add it, and commit. Here the lamp turns red while the clash is open and green once both wagons fit.