CLR Stored procedures always showing change

je_ry_ga

We have an handful of CLR stored procedures/functions that are showing changes & a also conflict. (even though I haven't changed them) If I try to resolve the conflict, I can't check them in. I can't check in if I "Take Theirs" and if "I keep mine" it won't let me check them because I need to check in objects they reference (that haven't changed".

Also, I can't check in other stored procedures that reference them.

SQL Source control version 6.0.2.6908 - TFS - Visual Studio Online - Shared DB

je_ry_ga

je_ry_ga

Ended up including all the assemblies that were in the referenced CLR objects by changing the filter to let me check it in. Would have liked to ignore CLR objects in our our source control altogether and just ignored them as dependencies.