eclipse cvs upate fail due to conflict

if some file ASCII/Binary property is set as -kb, then if this file conflict, you can't update from cvs, though you have merged manually,  but you can mark it as merged after you synchronize with cvs.

or you can use 'override and update', this way , your local changes will be override.

 

or you can change ASCII/Binary property to be -kkv, this way, if the file format is unix on cvs, then it will be changed to DOS after you update it.