Subversion还原已解析的文件 [英] Subversion reverting resolved file

查看:80
本文介绍了Subversion还原已解析的文件的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

如果我要在我标记为已解决的文件中犯错误,是否有一种方法可以使文件恢复为原始冲突状态,而无需还原所有更改并重新尝试合并?

If I was to make an error in a file that I have marked resolved is there a way to go back to having the file in it's original conflicted state without reverting all changes and reattempting the merge?

推荐答案

否,没有自动的方法可以做到这一点.如果要执行此操作,则必须提前手动备份.mine文件,以便在需要时可以将其取回.

No, there is no automatic way to do that. If you want to be able to do that, you'll have to manually back up the .mine file ahead of time so that you can get it back if needed.

这篇关于Subversion还原已解析的文件的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆