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?