Merging Drupal code branches

Composer conflicts

When a developer works on a project, they may often need to install and configure modules. If developers do this in their own branch, they will encounter a conflict on composer.lock when merging their work.

In order to get both changes synced, we really only care about the changes in composer.json.

Level
Topics