thierry-b
6/8/2017 - 10:48 AM

Tip: Resolve composer git conflicts

Tip: Resolve composer git conflicts

composer_git_conflicts
content_copyfile_download
git diff HEAD MERGE_HEAD -- composer.json
git checkout origin/DEV -- composer.lock
git checkout origin/DEV -- composer.json
composer update drupal/migrate_tools:^4.0@beta
composer require drupal/migrate_plus:^4.0@beta --update-with-dependencies