Indeed. The Composer merge driver is critical for being able to work with modern PHP frameworks without tearing your hear out on every merge. Merge drivers are

Indeed. The Composer merge driver is critical for being able to work with modern PHP frameworks without tearing your hear out on every merge. Merge drivers are Git's most powerful and least known feature, and I really wish they were more common.