← Customer Feedback for Redgate Settings and activity 1 result found Improved object merge support - Provide ability to merge a conflicted object, instead of just Keep Mine or Take Theirs 131 votes Vote Vote Vote Vote We're glad you're herePlease sign in to leave feedback Signed in as (Sign out) Close Close 1 vote 2 votes 3 votes Remove votes You have left! (?) (thinking…) under review · 20 comments · SQL Source Control · Delete… · Admin → How important is this to you? Not at all You must login first! Important You must login first! Critical You must login first! We're glad you're herePlease sign in to leave feedback Signed in as (Sign out) Close Close Geoff Pate supported this idea · Feb 22, 2011 An error occurred while saving the comment Geoff Pate commented · Feb 22, 2011 · Edit… · Delete… 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) Save Submitting...
Geoff Pate
supported this idea
·
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)