README

Globally install this composer plugin, and if you ever run composer update --lock on a repository that has active merge conflicts in the composer.lock or vendor/composer/installed.json, then this will use a stream wrapper to rewrite the contents to a temporary file and load those instead of the real merge conflicted file, allowing composer to load the lock file even though it will has invalid json.

Usage

composer global require "spencermalone/composer-merge-bypass-plugin 0.0.2"

If you ever run into a merge conflict on composer.lock or vendor/composer/installed.json, you can just composer update --lock with the merge conflicts still in place, and the "right thing" will happen (ie, it'll use a version of those files without any invalid characters and regenerate the contents)

Honorable Mention

Much of this is based on https://github.com/dg/bypass-finals, but applied to composer lock/json files instead of PHP source code.