Add .gitattributes file

jelaniwoods · jelaniwoods · commit e091bb90baff · 2020-06-09T10:43:01.000-05:00
diff --git a/files/.gitattributes b/files/.gitattributes
@@ -0,0 +1 @@
+db/development.sqlite3 merge=ours
diff --git 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 ".pryrc", render_file(".gitattributes")
   file "Procfile", render_file("Procfile")
 
   inside "config" do
