We try to develop business processes in team. Every member of team make his own branch, and work on process. After that we try to merge branches in one branch master, but a lot of conflicts appears:

<<<<<<< HEAD
<bpsim:ElementParameters xsi:type="bpsim:ElementParameters" elementRef="_B522FC25-C305-43A2-B22B-CF9D2280A47B" id="_rucp8h2REeqUr8GsL--YmA">
=======
<bpsim:ElementParameters xsi:type="bpsim:ElementParameters" elementRef="_B522FC25-C305-43A2-B22B-CF9D2280A47B" id="_ouptgR2QEeqUr8GsL--YmA">
>>>>>>> origin/156462

It is possible to do something with it? May be not to regenerate Ids of nodes, that are not changed? Manual comparing is more harder than copy-paste changes by hands. Another disadvantage is that BC reloads all process diagram when somebody make changes in process diagram in BC.

And another question, why BC supports branches, if there are no way to merge branch back?

PS. I ask same question here: https://groups.google.com/forum/#!topic/jbpm-development/gwCsyVfXe4A and here: https://stackoverflow.com/questions/59348647/merging-two-versions-of-bpmn-xml-files.

May be jBPM team can do something with this issue.

Thanks!