When I resolve a merge conflict by hand and accidentally wipe out my coworker’s work ⌘ Read more