Hi there,
Pretty much in all our merges we come across the error described in this article: https://www.ptc.com/en/support/article/CS125580
- Member <Member Name>: *** no action will be performed due to errors ***
Error: Two revisions (<rev1> from change package <CP1> and <rev2> from change package <CP2>) in the change packages are in conflict. They refer to two different revision branches <branch1> and <branch2>. All modifications must apply to the same revision branch. If you wish to accept the most recent revision (<rev3>) for this member, rerun the command with the Ignore Cross-Branch Entries (--ignoreBranches) flag
We are aware why this error is reported and how to avoid it. Unfortunately, it still happens that developer submit work from different branches into the same change package, just by accident.
Is there an option to block Cross-Branch Entries from happening?
Thank you and best regards,
Michael
