We've migrated most of our SVN repos to Git and developers are working mostly with feature branches that get merged into a develop branch (using the GitFlow branch development structure).
We have several linked/lookup tables that we version control using SQL Source Control.
When merging our updates to these records we often hit merge conflicts since SQL Source Control always puts updated/inserted rows on top and then puts them back in their proper order on the next commit.
This will not work well with developers who most often work out of a feature branch and then merge changes back into a common branch.
Is Red Gate addressing this issue? Is there a current work-around for this? It seems like if we *always* forced the records to be in numeric order then a lot of this headache would be avoided.