Add .gitattributes file

firstdraft · Jun 9, 2020 · 2b394a9 · 2b394a9
1 parent 05eca7e
commit 2b394a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
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 ".gitattributes", render_file(".gitattributes")
   file "Procfile", render_file("Procfile")
 
   inside "config" do