update

jeremyyeo · jeremyyeo · commit 3b8890f3df86 · 2023-08-03T12:28:35.000+12:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ dbt_modules/
 logs/
 target/
 venv*
+.env
diff --git a/dbt_project.yml b/dbt_project.yml
@@ -5,4 +5,4 @@ version: 1.0
 
 models:
   my_dbt_project:
-    +materialized: incremental
+    +materialized: table
diff --git a/models/foo.sql b/models/foo.sql
@@ -1,5 +1 @@
-<<<<<<< HEAD
-select 1 id
-=======
-select 2 id
->>>>>>> 33e4c91008b867cf6dab5c7b61acbf44d293b3af
+select 1 as id

-Original file line number
+Diff line change
 logs/
 target/
 venv*
 +.env