Draft of 40-page journal extension paper submitted to EMSE Journal. Empirical Software Engineering (EMSE) invited journal extension of ICSME'17 paper "Software Practitioner Perspectives on Merge Conflicts and Resolutions." Currently under submission.