Git Conflict Simulation
alice -- bash
A
bob -- bash
B
<- prev
ready -- press next to start
next ->
reset
alice
bob
conflict markers
resolved