How do you resolve a complex Git merge conflict when multiple developers have modified the same layout or configuration files at Accelyst?
