merging SSC files between branches

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.


Sign In or Register to comment.