From 3b376b8946c1e28c72d6069eab3b996cf852fe2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= <ben@agaric.coop>
Date: Fri, 18 Jun 2021 22:35:41 -0400
Subject: [PATCH] Add advice on using git

---
 tools/git-usage.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tools/git-usage.md

diff --git a/tools/git-usage.md b/tools/git-usage.md
new file mode 100644
index 0000000..8d2fff6
--- /dev/null
+++ b/tools/git-usage.md
@@ -0,0 +1,14 @@
+# Git Usage
+
+## When NOT to manually resolve merge conflicts
+
+When it's an automatically generated file!
+
+For composer.json:
+
+```
+rm composer.lock
+ddev composer update
+git add composer.lock
+git commit
+```