← Customer Feedback for Redgate Settings and activity 1 result found Provide a merge option for conflicts 54 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…) 8 comments · Oracle » 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 An error occurred while saving the comment Erik Stok commented · Jun 16, 2015 · Edit… · Delete… @Richard: Yes, that is what would really help us. We know how to solve a conflict, but at the moment we cannot because we have no means to do it other then preferring one file over the other by force. Save Submitting... Erik Stok supported this idea · Jun 16, 2015
Erik Stok
supported this idea
·
@Richard: Yes, that is what would really help us. We know how to solve a conflict, but at the moment we cannot because we have no means to do it other then preferring one file over the other by force.