黑色头发

有志者事竟成破釜沉舟百二秦关终属楚 苦心人天不负卧薪尝胆三千越甲可吞吴...

svn A conflict in the working copy obstructs the current operation

使用svn merge 合并之后,有的文件会显示特殊的冲突 A conflict in the working copy obstructs the current operation A conflict in the working copy obstructs the c...

2012-10-18 17:21:52

阅读数 16

评论数 0

svn Reintegrate can only be used if revisions through were previously merged fro

svn合并的时候,报错 svn: Reintegrate can only be used if revisions 3234 through 4332 were previously merged from svn://xxx.xxx.xx.xx/xxx/xxx/xxx/src t...

2012-10-18 17:08:50

阅读数 84

评论数 0

svn 提交的时候 Transaction is out of date

更新一下再提交就好了 Transaction is out of date svn: Commit failed (details follow): svn: Out of date: '/project/test/branches/test' in transaction 'i' ...

2012-10-18 16:57:46

阅读数 24

评论数 0

SVN merge 合并 选择svn路径时候报错 Folder '' does exist remotely

Folder '' does exist remotely 在合并的时候,选择了Reintegrate a branch之后,再选择SVN的tag路径的时候,报错 Folder '' does exist remotely,并且点了确定还一直弹出这个警告 [img]http://dl...

2012-10-18 16:55:51

阅读数 68

评论数 0

提示
确定要删除当前文章?
取消 删除
关闭
关闭