Resolving Merge Conflicts in SQL Source Control: The Basics (Video)

In this 35 minute livestream recording, I commit conflicting code to a Git repo in Azure DevOps Services using Redgate’s SQL Source Control, then step through options to fix the conflict.

We first run through an example where we hit a conflict when pushing to the master branch and resolve that. Then we run through an example where we are using a feature branch and identify the conflict when doing a pull request to merge the change into master.

Continue reading

Links and Resources from How to Architect Successful Database Changes

Steve Jones and I had a great time today talking about source control for databases and release patterns for performance and availability in Seattle. We had a group of folks who asked terrific questions, made thoughtful comments, and interacted throughout the day.

Continue reading

Setting a Custom Variable in an Azure DevOps Pipeline with PowerShell

Recently, I was doing a bit of work in Azure DevOps Services, preparing a demo for an upcoming webinar. I ran into a simple but frustrating problem.

Continue reading

Git Command Line Tutorial with SQL Change Automation for SSMS (Video)

I’m excited for Redgate’s new SQL Change Automation plugin for SQL Server Management Studio (SSMS).

SQL Change Automation lets DBAs and developers use a migrations-first approach to create precise scripts to apply changes to your database. If you’re curious about what I mean by “migrations-first”, read more about this approach, and how it compares to a state-first approach here.

Continue reading

Azure DevOps: How to Set a Custom Release Branch Folder Filter in Build Pipeline Triggers (Video)

This is the first in a series of posts about simple things that I had a hard time figuring out in Azure DevOps services.

It can be very useful to enable Continuous Integration for multiple folders in your DevOps pipeline: say, for every branch created under releases/ or features/. But configuring this can be strangely confusing!

Continue reading