SQL Source Control - 1.1
Learning SQL Source Control - 1.1
Conflicts
Conflicts occur when the latest version of an object in source control and the latest version in the database are incompatible. Conflicted objects cannot be committed or retrieved until the conflict has been resolved.
This can happen, for example, if two people modify the same stored procedure.
When a conflict occurs, the Conflict to resolve bar is displayed in the Object Differences pane:
To resolve a conflict, choose either:
- Keep mine
Your changes are committed to source control.
This replaces any changes to the latest source control version that are not present in your database version.
Or
- Take theirs
Your changes are discarded, and the database is updated to the latest source control version.
Note that merging is not currently supported.
To merge changes from two conflicting versions of an object, resolve the conflict, and then manually edit the object to include the changes from the other version.
To make this easier, you can copy either version of an object's creation script from the Object Differences pane, and paste it into a new query window.
To avoid conflicts, you are recommended always to get the latest version of an object before modifying it.
See also |
Was this article helpful?
Worked example: setting up SQL Source Control with SVN for development teams
Worked example: setting up SQL Source Control with TFS for development teams
Using SQL Source Control
Linking a database to source controlCommitting changesGetting the latest versionUsing SVN bug IDs & TFS work itemsViewing source control logs / historyGetting a specific versionUndoing changesConflictsDeploying a database from source controlSetting up a local Subversion repository
Setting up a Subversion server
Continuous integration
Source controlling data
Evaluation center
SQL Source Control
- Setting SQL Compare options within SQL Source Control
- "ICredentialsProvider is unset, therefore can't get" error occurring within SQL Source Control
- Linking fails due to SVN pre-commit hooks
- Logging changes to shared databases
- Object changed by Unknown
- Setting permissions for SQL Source Control
- Using SQL Source Control with Team Foundation Server 2012 or tfspreview.com
- Error: Failed to resolve no-ops after 5 tries
- Using SQL Compare or SQL Changeset scripts with SQL Source Control
all SQL products
- Compatibility of Red Gate tools in 64-bit environments
- Application has encountered an error and needs to close
- Error message after installing SQL Toolbelt - The description for Event ID ( 1 ) in Source ( nview_info ) cannot be found.
- Changing the temporary directory used by the installer
- Toolbelt Installer "hanging" while "scanning volumes"
- Login failing with "trusted SQL Server connection" error when using RunAs
all products
- Some Red Gate products identified as containing a trojan by Anti-Virus software
- Activation may fail with Unknown Error -1
- Product uses web help although a CHM file is available locally
- Argument exception resulting from missing environment variable
- Check for updates may fail when used through proxies
- 'Unidentified Publisher' error when repairing or uninstalling
- Licensing activates product as standard edition
- Moving Red Gate software products to another machine
- Red Gate tools log locations
- The application UI opening slowly when there is no internet access
SQL Source Control
- Database development models
- Release notes - version 1.0
- Release notes - version 1.1
- Release notes - version 2.0
- Release notes - version 2.1
- Release notes - version 2.2
- Requirements & prerequisites
- Technical Overview
- Release notes - version 3.0
all SQL products
all products
- Red Gate product acknowledgements
- Activating your products
- Activating your products
- Red Gate bundle history
- Check for updates
- Troubleshooting Check for Updates errors
- Current versions
- Deactivating your products
- Installing Red Gate products from the .msi file
- Requesting additional activations
- Serial numbers for bundles
- Reactivating using a different serial number
- Extending your trial
- Finding your serial numbers
- Moving a serial number from one computer to another
- No response received for manual activation
- Licensing and activation resources
- Licensing and activation resources
- Troubleshooting licensing and activation errors
- Licensing and activation FAQs
- Red Gate tools log file locations
- Download old versions of products
- Download product prerequisites & utilities
- Support & upgrades
- Upgrading your software
- Upgrading FAQs
