Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composer returns "Your requirements could not be resolved to an installable set of packages." #3

Closed
logue opened this issue Jan 12, 2019 · 1 comment

Comments

@logue
Copy link

logue commented Jan 12, 2019

The framework (Laravel) used in my project can not be installed because it requires a new version of sebastian/diff.
Can you change the definition of composer.json or support the latest version?

  Problem 1
    - Installation request for bircher/php-merge ^2.0 -> satisfiable by bircher/php-merge[2.0.0].
    - Conclusion: remove sebastian/diff 3.0.1
    - Conclusion: don't install sebastian/diff 3.0.1
    - bircher/php-merge 2.0.0 requires sebastian/diff ^1.3 -> satisfiable by sebastian/diff[1.3.0, 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.x-dev].
    - Can only install one of: sebastian/diff[1.3.0, 3.0.1].
    - Can only install one of: sebastian/diff[1.4.0, 3.0.1].
    - Can only install one of: sebastian/diff[1.4.1, 3.0.1].
    - Can only install one of: sebastian/diff[1.4.2, 3.0.1].
    - Can only install one of: sebastian/diff[1.4.3, 3.0.1].
    - Can only install one of: sebastian/diff[1.4.x-dev, 3.0.1].
    - Installation request for sebastian/diff (locked at 3.0.1) -> satisfiable by sebastian/diff[3.0.1].
bircher added a commit that referenced this issue Mar 3, 2019
This changes the behaviour of the merge conflict exception. It now returns lines with the end of line character. In addition it now also diffs like git.
@bircher
Copy link
Owner

bircher commented Mar 15, 2019

I just tagged 2.1.0 and 3.0.0 which should both be compatible with your other dependencies.

@bircher bircher closed this as completed Mar 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants