simulation of scm deliver/accept
Is there a way to detect if a "scm accept" or "scm deliver" will cause any conflicts? (e.g. execution of the command without really accepting or delivering)
What I want to do is: 1) check if scm accept will cause conflicts, if yes --> errormessage and exit 2) do some batch processing on the host 3) scm accept |
One answer
Running the 'show status' command will show the potential conflicts but the conflicts may get auto merged/resolved during an accept. I don't believe there is a way to check if a conflict is auto resolvable or not without accepting the changes.
|