Find centralized, trusted content and collaborate around the technologies you use most.
Teams
Q&A for work
Connect and share knowledge within a single location that is structured and easy to search.
当我遇到冲突时,我可以做
*覆盖和更新,以获取传入的更改
如何让它接受我的更改并忽略传入的更改?
“覆盖并提交”实际上试图提交,我当时不想这样做。
使用 svn 命令行客户端,上面很简单
选择Mark as merged要在其中使用本地版本的文件。
Mark as merged