Here’s an idea for a competitive sport: a race to see who can first merge two Git branches that have diverged significantly. The difficulty can dictate the number and types of conflicts that need to be resolve. Can also spice it up by breaking or not including unit tests.
