Provide a merge option for conflicts
Instead of take database version, or take source control version, we sometimes wish to merge the two changes.
(If you vote on this idea please also mention any tools you use for merging files in source control)
Brian Lieb commented
Tomas Scott commented
TFS Merge tool
Allen Sun commented
We use BeyondCompare for merging.