davidxl added a comment. yes, the old behavior should be the default. It raises the awareness of the problem (and merge errors are usually rare in reality). CHANGES SINCE LAST ACTION https://reviews.llvm.org/D66985/new/ https://reviews.llvm.org/D66985