Search found 1 match
- Mon May 18, 2020 2:44 pm
- Forum: General Questions
- Topic: Parameters for Magic Merger in Tortoise
- Replies: 2
- Views: 1423
Parameters for Magic Merger in Tortoise
Hi, I've been trying to use Tortoise and the Ranorex Magic Merger to resolve merging conflicts in my project. But when the Magic Merger opens it shows me the following message: "Cannot merge because no merge'base' is available. Please choose 'mine' or 'theirs' via the source control system.' I think...