11月32014
SVN Skipped 'xxx' -- Node remains in conflict 错误的解决办法
今天svn提交发现错误
#cd /home/svn/app/
# svn up
Updating '.':Skipped 'xxx' -- Node remains in conflict
At revision 1054.
Summary of conflicts:
Skipped paths: 1
处理方式:
#cd /home/svn/app/
#mkdir /root/bak
#mv /home/svn/app/* /root/bak/
#svn revert .
#svn up
如果还是不可以,出绝招:
svn remove --force filename svn resolve --accept=working filename
svn up
发表评论
木有头像就木JJ啦!还木有头像吗?点这里申请属于你的个性Gravatar头像吧!