How do I minimize merge conflicts in a ReadyApi composite project when working as part of a team?

Hi,

We also face this issue, so we setup some rules to follow to avoid merge.

1. Never ever save your Project by pressing Ctrl+S, instead of that save a particular test by right click on test --> Composite Actions --> Save TestCase
2. If any new properties added to Test Suite then add them manually by updating relevant Settings.xml
   • Open Setting-xml in Notepad Editor and add new property node as shown below.
   •  <con:properties><con:property>
           <con:name>key</con:name>
           <con:value>value</con:value>
        </con:property>
     </con:properties>
3. Similar approach for Project level properties, add them manually by opening settings.xml in notepad++ editor and then save
4. Addition of new tests should be also added to element.order manually and save

by performing above rule we only commit intended changes by us.

We are not getting any surprises of lot file changes which Ready API does in BackGround when you press Ctrl+S.

This is working fine for us, and yes all our members are having same settings (like pretty print enable)

I hope this helps

Kind regards

Bch