git merge 忽略指定文件

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 #spring.profiles.active: dev
-spring.profiles.active: test
-#spring.profiles.active: prod
+#spring.profiles.active: test
+spring.profiles.active: prod
 
 spring:
   application: