Smartgit: Resolve merge conflict shows "Command Resolve failed!" error message

Viewed 10

When I click on the button "Take Ours" or right-click on the file and select "Resolve/Take Ours" it shows the following error popup:

enter image description here

How could I solve this issue? (Restarting Smartgit did not help).

0 Answers
Related