Yeah, this was especially irritating in a python project that uses poetry, cause every single one would cause a merge conflict. We stopped using it altogether because of that. Will have to give this a try.