[SVN] remains in conflict 에러 해결

svn up 을 했더니 기존데이터랑 쫑(?)이 나서 C 가 생겼다 ..

머지를 해주고 commit을 하려고 했더니 위와 에라 발생

[dari88@laon2 ictl485d]$ svn commit

svn: Commit failed (details follow):

svn: Aborting commit: '/home/dari88/projects/icontrols_16/qop_package/ictl485d/message_from_ethernet.c' remains in conflict

해결 법

svn remove --force filename
svn resolve --accept=working  filename
svn commit

아래는 실제 명령 사례

[dari88@laon2 ictl485d]$ svn resolved message_from_ethernet.c

Resolved conflicted state of 'message_from_ethernet.c'

출처:

http://stackoverflow.com/questions/2406469/svn-remains-in-conflict