Daily Standup Day 2: Merge conflicts!
Developer Terry: “I spent the day resolving merge conflicts.”
Developer Jan: “I had all my merge conflicts resolved until Terry checked in.”
Developer Fran: “I had all my merge conflicts resolved until Jan and Terry checked their stuff in.”