- [SVN] Your file or directory '...' is probably out-of-date
- 日常茶飯事
- 2011. 10. 5. 05:32
commit -m "" D:/reps/nwds/prt.xxx/src.core/net/test/TestDAO.java
Sending D:/reps/nwds/prt.xxx/src.core/net/test/TestDAO.java
Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file or directory 'TestDAO.java' is probably out-of-date
svn:
The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
Sending D:/reps/nwds/prt.xxx/src.core/net/test/TestDAO.java
Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file or directory 'TestDAO.java' is probably out-of-date
svn:
The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
- 환경 : NWDS + Subclipse_0.9.3.3
- 충돌 발생
- Update, Revert 하면 충돌파일 사라짐.
- 해당 파일은 수정전으로 돌아감.
수정한 내용을 붙여넣고 커밋했음.
[todo] 파일을 복사해 넣어도 되지 않았을까?
Recent comment