0
Eclipse- RAD에서 Team-> Update를 수행 할 때 다음과 같은 오류가 발생합니다. 어떻게하면이 문제를 해결할 수 있을까요?eclipse/RAD/CVSNT 팀 업데이트 오류
cvs update -l -d -P "/Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java" "/Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java"
U ejbModule/com/arch/boss/dao/BossDeviceDAO.java
cvs server: nonmergeable file needs merge
cvs server: revision 1.17 from repository is now in ejbModule/com/arch/boss/dao/BossDeviceDAO.java
cvs server: file from working directory is now in .#BossDeviceDAO.java.1.16
C ejbModule/com/arch/boss/dao/BossDeviceDAO.java
ok (took 0:21.461)
Error: The following warnings were reported while performing the "cvs update" command.
Error: Boss: An unmergable conflict has occurred for binary file /Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java. Revision 1.17 has been loaded and overwritten local changes have been saved in file /Boss/ejbModule/com/arch/boss/dao/.#BossDeviceDAO.java.1.16
***