Stephen Beemsterboer

@glensc these bits of logic were supposed to match the indentation and preserve the specific type of indentation (and in the case the case of spaces, the appropriate width), but...

@glensc looks like the regex was updated again, want to update this PR accordingly? https://github.com/composer/composer/commit/0ab48a1773e55ee1706d43e739fa5719811a87c8#diff-577304d6b2175e0b5c3fe90ff0a78239R31

This is part of `2.0.0-alpha`, but at first blush I can't imagine there would be any BC issues. Thoughts?

The merge driver itself would be inappropriate for this purpose, since it has already been fully executed by the time the user is manually fixing merge conflicts and where this...

@eelkeblok there are a few issues that make it problematic: 1. depending on how many dependencies there are, `composer update --lock` can take a really long time (even though it...

You're right, if that is the primary merge conflict you face. However, that is also the easiest conflict to fix. Simply remove the entirety of the conflict markers and conflicting...

consider backwards compatibility for existing packages that have consecutive dashes

Hey there! Sorry I haven't had a chance to look into this until now - hopefully I'll have something by today.

Hi @anboto - I'm very sorry about the delay! I just published a new release that should fix the issue with the installers. The installer settings should now behave as...

I have created a custom git merge driver that can be used to minimize merge conflicts in `composer.json` and `composer.lock` files. Handling this at the merge step (instead of grappling...