It's all about the answers!

Ask a question

simulation of scm deliver/accept

Bernd van Oostrum (21724767) | asked Nov 13 '15, 8:30 a.m.
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

permanent link
Shashikant Padur (4.2k27) | answered Nov 17 '15, 12:10 a.m.
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.

Your answer

Register or to post your answer.