I just found that one of the developers here has managed to commit a file with a conflict in it.
I had been under the impression, based on documentation and past experience, that it was impossible to commit a file with conflict markers inside it. However, I just witnessed this. Are my assumptions about this mistaken? What circumstances allow unresolved conflicts to be committed back to the repository? -David _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
