Skip to content
← SQL Source Control

How can we improve SQL Source Control?

SQL Source Control

Categories

JUMP TO ANOTHER FORUM

(thinking…)

Improved object merge support - Provide ability to merge a conflicted object, instead of just Keep Mine or Take Theirs

I have seen no way on how to actually do a merge with SVN and mark as merged etc
We really need a more inutuitive way to merge the changes to SVN and vice versa. At the moment I am getting conflicts that I can't put into SVN because there is no way to say it has been merged, or even how to merge the changes.

131 votes
Vote

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
You have left! (?) (thinking…)
Andrew Scott shared this idea  ·   ·  Report…  ·  Admin →
How important is this to you?

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
Submitting...
An error occurred while saving the comment
  • TheoL commented  ·   ·  Report

    ExamDiff pro is an excellent compare tool with merge facilities. See https://www.prestosoft.com/edp_examdiffpro.asp.
    It would be great if SQL Source Control also supported this for merging.

    A good alternative would be to allow any “external merge tool” to be used for merging, where the application, and arguments can be specified.
    The latter option effectively should support almost any merge tool, including WinMerge and UltraCompare

  • Jacob Stamm commented  ·   ·  Report

    It would be great if *any* mergetool were supported. This shouldn't have to be enabled on a per-app basis if the proper data is being shelled out to and from the given mergetool, like other git clients support

  • Nathan Robinson commented  ·   ·  Report

    Add support for manually merging changes in Visual Studio or VS Code instead of KDiff3 or Beyond Compare

  • Scott Paist commented  ·   ·  Report

    Of course, a built-in merge tool is preferable. I shouldn't have to go out of SQL Source Control to merge.

  • Scott Paist commented  ·   ·  Report

    It would be fantastic to be able to use the Visual Studio merge tool for this.

  • Christian Rohr commented  ·   ·  Report

    Is there any way to Setting up a different merge tool? (For example WinMerge) Thank you.

  • Victor Mascari commented  ·   ·  Report

    Being able to configure the merge tool to use would be nice (rather than just two - BC and KDiff).

    For example, Git let's you configure how to call all sorts of merge tools, allowing the user to use the tool they are most comfortable with.

  • Mickey Stuewe commented  ·   ·  Report

    I would like to merge Table scripts as well.

    Use Case: A teammate added a Trigger and modified a field in a table and checked it in. I just got done adding documentation to all the columns (with SQL Doc :-) ) and would like to check my changes in too. Now I need to merge the two.

  • EricP commented  ·   ·  Report

    I would like to see UltraCompare also supported as a Merge Tool.

  • Justin Whaley commented  ·   ·  Report

    Additionally I would like to see Code Compare [http://www.devart.com/codecompare] as a possible option. This is a tool that is both free to use, and has additional pro options.

    If it is cumbersome to continue to add new options, if you could simply expose a how they are passing the data to the apps and I'm sure some of the clever people in the community could handle the rest. Most of these types of applications have command line options and just need them in their particular way.

  • Anonymous commented  ·   ·  Report

    Hi,
    I recently saw the new feature about merging stored procedures in conflicts.
    Nice job! Smile
    I can see only 2 products supported:
    - KDiff3 (Old and with a KDE style UI)
    - Beyond Compare 3 (Nice UI but not free)

    What about supporting WinMerge?
    http://winmerge.org/

    It's Open Source and with a much better UI.

  • Rob commented  ·   ·  Report

    I love that I can now merge stored procedures in Beyond Compare. I frequently find the need to merge tables (including indexes), views, UDFs, and UDTs. All else being equal, I'd prefer "take left, take right, left then right, right then left" exist within SQL Source Control, but leveraging Beyond Compare works nicely too.

  • Geir Andre commented  ·   ·  Report

    UDFs and triggers are very important for us. But also views would be great.

  • Stephen commented  ·   ·  Report

    +1 for UDFs and triggers, not just SPs, please.

  • Geir Andre commented  ·   ·  Report

    I would prefer this merge tool to exist inside SQL Source Control. It would be great to have the option to Merge, Keep Mine or Take Theirs. With Merge you could do different operations at different places within the script, like move text blocks before/after, or select text blocks and decide to take theirs or keep mine.

  • Geoff Pate commented  ·   ·  Report

    I think we'd like to see a three way merge tool like p4merge or beyondcompare rather than accept mine\theirs. Particularly in scenarios where there are lots of merges (merging from the trunk to work branches for example)

  • AdminRedgate Administrator (Admin, Redgate) commented  ·   ·  Report

    In SVN, I think merging has 2 different meanings. You can merge a branch back into trunk, but you can also merge individual files if there is a conflict (e.g., User1 edited Table1 and User2 also edited Table1 on thier own dedicated dbs. User1 committed without a problem. When User2 tries to commit, he will see a conflict that may need to be merged.) This topic is referring to merge in the second instance where there are conflicts on the same object.