How should I do if script conflict between local and github repository

Toad Data Studio
1

Hi All:

I've noticed that when Toad encounters conflicts, it seems the only option is to force the local source code to override the GitHub source code. There's no way to choose which GitHub source code should take precedence over the local one, and there's no merge mechanism for conflicts between the two. Is this feature not currently available?

John

2

Hi John,

Thanks for using the User Forums. We are actually planning to extensively enhance Github Source Control in TDS in our Oct/Nov release. We had some commitments to meet for our July release but Source Control has remained a priority for us. Our roadmap includes enhancements to the areas you've mentioned, and we expect those improvements to be delivered by the end of the year. Please stay tuned for upcoming release announcements and notifications for additional details.

3

Thank you for sharing. Besides Git-related source control mechanisms, will other centralized source control features be added (e.g., SVN)? Looking forward to the fourth season's release!

4

Yep, we have plans for support of Azure DevOps Server 2022, 2025, Azure DevOps Services and SVN v1.14.5.