We use Ready API (the commercialized version of SOAP UI) to develop our Automated Test Suite. However, even the smallest change in the UI will cause a mass changes on the xml test suits.
For example, simply load the project "Core". Git diff give us:
Before:
<con:project status="CLOSED" name="_Core">Core-abc-project</con:project>
<con:project status="CLOSED" name="_EU">EU-abc-project</con:project>
<con:project status="CLOSED" name="_US">US-abc-project</con:project>
After:
<con:project name="_Core">Core-abc-project</con:project>
<con:project status="CLOSED" name="_EU">EU-abc-project</con:project>
<con:project status="CLOSED" name="_US">US-abc-project</con:project>
That is not to mention the dreaded lastOpend.
I know we are not alone, as there are discussions here and here.
Here is the things that we did:
Make the project composite, to avoid multiple tests working on the same module
Use "Pretty Print" our XML
Setup excel-cmp to compare our Excel files in Git
It almost drives us crazy to merge pages after pages of xml conflicts, while the editor almost do nothing. Is there any way to further reduce these merge conflicts?