From 2b394a964fe3c7d2eeff7cd688aee11e2524617b Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Tue, 9 Jun 2020 10:43:01 -0500
Subject: [PATCH] Add .gitattributes file

---
 files/.gitattributes | 1 +
 template.rb          | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 files/.gitattributes

diff --git a/files/.gitattributes b/files/.gitattributes
new file mode 100644
index 0000000..1738a5f
--- /dev/null
+++ b/files/.gitattributes
@@ -0,0 +1 @@
+db/development.sqlite3 merge=ours
diff --git a/template.rb b/template.rb
index 79a7477..e06961f 100644
--- a/template.rb
+++ b/template.rb
@@ -257,6 +257,7 @@ def render_file(filename)
 
   file ".gitpod.yml", render_file(".gitpod.yml")
   file ".pryrc", render_file(".pryrc")
+  file ".gitattributes", render_file(".gitattributes")
   file "Procfile", render_file("Procfile")
 
   inside "config" do