merging SSC files between branches

fpdave100

We use SSC control to handle static data with SQL Server, SSMS and TFS.
When merging between branches, the SSC data files (the inserts!) do not get handled well by any compare tool used by Visual Studio for doing merge conflicts (we use Beyond Compare).  They are basically text files and get handled as such.

Would it be possible to somehow prefix the INSERT line by the comparison key (in a block comment?), so that the correct lines are lined up, and also the order should always be by comparison key.

AlexYates

This would be awesome. :-)

+1

Tianjiao_Li

There is an existing suggestion on our user voice forum so please do vote for it!

I've also escalated it to the development team to see if there is an update.

Tianjiao_Li

The development team has confirmed we're aware that the static data files are difficult to merge and will work on improving it in the near future. The internal reference for this task is SDC-2836. Please keep an eye on the release note!

Tianjiao_Li

In the meanwhile, you might want to consider to try pre and post script https://documentation.red-gate.com/soc7/common-tasks/working-with-pre-post-deployment-scripts/static-data