We make tests to solve subtle merge bugs like the article's example about dialogs, and watching what the other team members are merging help miles too.