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
+```