namoscato / resolve-composer-conflict

Utility to automatically resolve composer.lock git conflicts

Resolve Composer Conflict

Utility to automatically resolve composer.lock git conflicts.

Installation

npm i -g resolve-composer-conflict

Usage

resolve-composer-conflict <branch>

1. Merges the specified branch into the current branch if a merge is not already in progress
2. Prompts manual resolution of other conflicts if applicable
3. Resolves the composer.lock conflict by applying the current branch's updated dependencies to the merge branch's locked versions
4. Commits the merge with a description of the conflicting files

resolve-composer-conflict's Issues

Checkout parent composer.lock from origin

Handle more complex composer.json changes

i.e. do not include updated scripts, for example as updated package names

Add support for aliasing

my/package:"dev-branch as 1.2.3"

Merge not committed after manual retry

New dependencies are not included in composer update

Add --prefer-dist to composer update

Handle indirect dependency conflicts

Handle something like this:

Loading composer repositories with package information
Updating dependencies (including require-dev)
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - Conclusion: remove guzzlehttp/guzzle 6.2.3
    - Installation request for guzzlehttp/guzzle 6.2.3 -> satisfiable by guzzlehttp/guzzle[6.2.3].
    - Conclusion: don't install guzzlehttp/psr7 1.2.1
    - guzzlehttp/guzzle 6.2.3 requires guzzlehttp/psr7 ^1.4 -> satisfiable by guzzlehttp/psr7[1.4.2, 1.4.0, 1.4.1].
    - Can only install one of: guzzlehttp/psr7[1.4.0, 1.2.1].
    - Can only install one of: guzzlehttp/psr7[1.4.1, 1.2.1].
    - Can only install one of: guzzlehttp/psr7[1.4.2, 1.2.1].
    - Can only install one of: guzzlehttp/psr7[1.2.1, 1.4.2].
    - Installation request for guzzlehttp/psr7 (locked at 1.2.1) -> satisfiable by guzzlehttp/psr7[1.2.1].

Even though guzzlehttp/guzzle was the only thing updated, guzzlehttp/psr7 also has to updated.

Updated dependencies not found on composer.json conflict / manual git add before resolve

1. merge branch with composer.json conflict
2. manually resolve composer.json conflict
3. manually git add composer.json
4. continue
5. dependency diff doesn't work (doesn't see any updated dependencies)

Support complex merge conflicts

Enable the user to manually resolve non-composer.lock conflicts and then run utility again to finish out automatic resolution and merge

Support in-progress merges

Make package comparison case insensitive

Supports making casing changes