From 995a2621db714604983c892eaef2653fe3d425e2 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Sat, 2 Jun 2018 15:06:48 +0200
Subject: [PATCH] Prevent Git from auto-merging Composer's lockfile

Source: https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 792b550..64a3e28 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .gitmodules export-ignore
+
+composer.lock -merge