I hesitate to call folks who do this "professional", but yes. I have also worked around people who blindly resolve all conflicts with their version and then com

I hesitate to call folks who do this "professional", but yes. I have also worked around people who blindly resolve all conflicts with their version and then comment out the failing tests.