SVN Skipped'xxx'--Node remains in conflictエラーの解決方法
474 ワード
今日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
それでもだめなら、絶技を出す.
#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 filenamesvn up