My team found that the SuiteInfo file was always conflicted, and merging it was difficult. We don’t check our results into source control, and only wanted to merge changes to helpers. I wrote a python (2.6) script that clears out any suiteResults so that you can diff/merge and have an easier time with SuiteInfo file and source control. It creates a backup first, so you can revert it.
usage (if running from the directory with SuiteInfo):
python path o\clean_suiteinfo.py --path SuiteInfo