search

chendaniely / livelesson-git

0 stars 1 forks source link

a pr merge conflict example on github #6

Closed chendaniely closed 3 years ago

chendaniely commented 3 years ago

an example of conflicts that you don't know until you merge