Project deployment to solve the problem of easy conflict of configuration files

Project deployment, to solve the problem of easy conflict of configuration files. The configuration files of the
test environment and the operating environment are different, and the merge of different branches is prone to conflicts.
Now I think of a feasible solution:
1. There are backups for different operating environments, such as application.properties.dev; different environments are required There may be fewer configuration files, and it is best to use one
2. The database is the configuration file, but jdbc.properties still needs to be backed up in different operating environments