Your local changes to the following files would be overwritten by merge: src/common/env.js

根据引用内容，错误信息是：`error: Your local changes to the following files would be overwritten by merge: ... Please commit your changes or stash them before you merge. Aborting` 解决方案通常有两...

error: Your local changes to the following files would be overwritten by merge: src/main/resources/application.yml src/main/resources/db.setting Please commit your changes or stash them before you...

根据提供的引用内容，我无法找到与您提供的问题相关的信息。引用\[1\]是关于日志级别的设置，引用\[2\]和\[3\]是关于NavMesh构建和调试的内容。而您的问题是关于文件合并的冲突。如果您需要帮助解决文件合并冲突的问题，请提供更多的上下文信息，以便我能够更好地回答您的问题。 #### 引用[.reference_title] - *1* [Chrome的启动参数](https://blog.csdn.net/chenlei_525/article/details/113985913)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v91^control_2,239^v3^insert_chatgpt"}} ] [.reference_item] - *2* *3* [Unity 2017.2现已发布](https://blog.csdn.net/culiao6493/article/details/108645470)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v91^control_2,239^v3^insert_chatgpt"}} ] [.reference_item] [ .reference_list ]