How to resolve conflicts in SVN via Merge Tool?
I merged branch with trunk in SVN and got the conflict. I set up TortoiseSVN to resolve conflicts via Unreal Editor Merge Tool:
After that I tried to resolve the conflict, but nothing happened. After i press, for example, «Accept Source» button, Unreal Editor saves something and closes, but the conflict remains.
What is the right way to resolve conflicts? Maybe i'm doing it wrong? Or maybe this tool is bugged or somethig like that?
Thanks in advance, Dmitry.
asked Jul 26 '15 at 12:52 PM in Using UE4
Follow this question
Once you sign in you will be able to subscribe for any updates here