8000 RFC: Automatically resolve conflicts in composer.lock · Issue #6929 · composer/composer · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
RFC: Automatically resolve conflicts in composer.lock #6929
@hkdobrev

Description

@hkdobrev

When merging/rebasing branches it's not that rare that you may encounter merge conflicts in composer.lock. Most of the time the conflict would be in the hash or in a timestamp or in some cases you'd need to choose both blocks on the same lines.

However, it's quite rare you'd actually need to manually resolve something in composer.lock in a custom way.

The usual workflow:

  1. You have a conflict in composer.lock
  2. You run your git-mergetool and chose one of the hashes - doesn't matter which one.
  3. composer update --lock
  4. git add composer.lock
  5. git rebase --continue or git commit (if you're merging).

How about automatically fix the merge conflicts when running composer install or composer update --lock if possible?

This was already implemented in Yarn:

What do you think?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      0