Why does integration fail with error message “Please resolve the conflicts” if there are no conflicts?
The client doesn’t currently check whether there are actual conflicts or not, it just cancels and gives you possibility to find out. You can edit the message in file changelogic-project.properties through property called “cl.integration.pauseMessage”. Commenting out that line makes build script automatically continue with integration; downside is that when you have multiple conflicts, they will be reported one by one on every build script run and possibly after much processing may already have been performed;this may be very annoying. Actual conflicts are indicated by message “rcsmerge: warning: conflicts during merge” in merge log.
