resolve merge conflict in schema.rb (pulled new migration file but its empty?)

winsonwan · winsonwan · commit e630f6eaecac · 2024-04-17T17:02:51.000-07:00
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20240310070441) do
+ActiveRecord::Schema.define(version: 20240417020007) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`# It's strongly recommended that you check this file into your version control system.`
`13`	`13`
`14`		`-ActiveRecord::Schema.define(version: 20240310070441) do`
	`14`	`+ActiveRecord::Schema.define(version: 20240417020007) do`
`15`	`15`	`# These are extensions that must be enabled in order to support this database`
`16`	`16`	`enable_extension "plpgsql"`
`17`	`17`