Comment Comment by kuahyeow Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ? parent kuahyeow 2 years ago
