gith-demo-yo demonstration of resolving conflicts using git/github Hey guys! Welcome to the live session Hey, I'm Leo. I am working on a laptop and a workstation.