Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
According to http://www.perforce.com/perforce/doc.current/manuals/p4ant/p4tasks.html#p4jresolve, files with merge conflicts are skipped. Even setting failonerror=’true’ does nothing in the event of merge conflicts.
Is the best way to check for merge conflicts to use:
<p4jresolve failonerror='true' forceresolve='true'/>
then check for conflict markers? If so, what’s the Ant syntax to do that?
If
<p4jresolve/>doesn’t succeed (eg due to a conflict),<p4submit/>will fail.