While we are working hard on the new beta drop of 6.0 which is planned later this week,
allow me to introduce maintenance release
of Toad for SQL Server 5.8R2 which contains a set of fixes including most important for Version Control.
You may want to upgrade, grab the installer from here:
https://support.quest.com/searchdownloads.aspx?n=268441797
Regards,
Valentin