You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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].
The text was updated successfully, but these errors were encountered:
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.
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?
The text was updated successfully, but these errors were encountered: