zip file broken after conflict, no matter which option i choose

i and someone else both change the same zip file.
i commit it into the cvs, the other guy needs to update. idea detects a conflict and asks him to pick either his file or the one from the cvs. in both cases, the file is broken.
how can i fix it? is it a bug?

2 comments
Comment actions Permalink

Is it also broken on the CVS repository? What if you use CVS from the terminal rather than through IntelliJ?

0
Comment actions Permalink

if there is no conflict, the update works fine and the file is ok.

0

Please sign in to leave a comment.