I had a problem with the following file in the Xalan2 Project /java/src/org/apache/xalan/lib/sql/SQLDocument.java. I managed to make the status "Unresolved Conflict". Tried what I knew, then I removed the file then replaced it. The project compiles fine now and I resolved the original conflict with the file. I just want to make sure that I did not create some hidden conflict that will cause more issues down the line. Could a CVS guru please take a look at the repository to make sure all is OK. Thanks John Gentilin
