'D:\yinhaiyiliao\flowgine\msgback\project\src\main\java' remains in conflict

引用中提到，在重命名目录后再次提交时会报错 "Aborting commit: remains in conflict"。引用中解释了 Git 中 "resolved" 命令的用法，它可以删除冲突相关的文件并允许路径再次提交。根据引用中的内容，可能在更新 Visual Studio 2008 项目文件时出现了冲突。

要解决冲突，你可以尝试使用 Git 的 "resolved" 命令来删除 'D:\yinhaiyiliao\flowgine\msgback\project\src\main\java' 相关的冲突文件，然后再次提交。这样应该能够解决冲突并成功提交你的更改。<span class="em">1</span><span class="em">2</span><span class="em">3</span>
#### 引用[.reference_title]
- *1* *2* [svn提交时提示 Aborting commit: remains in conflict 解决办法](https://blog.csdn.net/xingyali/article/details/80410254)[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^v93^chatsearchT3_2"}}] [.reference_item style="max-width: 50%"]
- *3* [Bochs - The cross platform IA-32 (x86) emulator](https://download.csdn.net/download/luowei505050/3089789)[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^v93^chatsearchT3_2"}}] [.reference_item style="max-width: 50%"]
[ .reference_list ]