git - Merging two versions of bpmn (xml) files

Question

We develop processes in jBPM Business Central. And we create two branches for two developers, and every developer make some changes. After that, I try to merge changes, but get a lot of conflicts like this:

<<<<<<< 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/some-branch

How to merge bpmn files properly? May be some special software exists?

Answer 1

You can use BPMN Sketch Miner to represent your processes as text.

Then you can do the diff and merge conflict resolution directly on the source text.