Spread the love“`html When collaborating on software projects, merge conflicts can often feel like the bane of a developer’s existence. They crop up when two branches have diverged and a change made ...
Merge conflicts are stored in a table called MSMerge_Conflicts_Info that is a system table in the Publication and the Subscription databases. SSMS has an interactive Conflict Viewer that uses this ...