When merging/rebasing branches it's not that rare that you may encounter merge conflicts in composer.lock. Most of the time the conflict would be in the hash or in a timestamp or in some cases you'd need to choose both blocks on the same lines.

However, it's quite rare you'd actually need to manually resolve something in composer.lock in a custom way.

The usual workflow:

1. You have a conflict in composer.lock
2. You run your git-mergetool and chose one of the hashes - doesn't matter which one.
3. composer update --lock
4. git add composer.lock
5. git rebase --continue or git commit (if you're merging).

How about automatically fix the merge conflicts when running composer install or composer update --lock if possible?

This was already implemented in Yarn:

• Pull request: Auto detect and merge lockfile conflicts yarnpkg/yarn#3544
• Announcement: https://code.facebook.com/posts/274518539716230
• Screenshot: https://user-images.githubusercontent.com/13352/27958995-8104ab7e-631d-11e7-8050-a36cbb48e75d.png

What do you think?