Unity Smart Merge (Bug?) 'Reopen Merge Tool'

Unity Engine
1

I believe I have the correct thread but if that’s not the case please feel to redirect me.

Before posting this I tried searching the forums as well as Googling, and referencing the Smart Merge manual (Unity - Manual: Smart merge) but haven’t been able to find a single post

I recently tried using using Unity’s built-in Smart Merge tool and came across the following error when trying to merge to files. I’m using version 5.3.4f1 Personal. Here’s the error message window:

2628875--184765--Smart Merge Error Message.png

Clicking on ‘Reopen Merge Tool’ takes me back to one window prior (to ‘Accept’ or ‘Cancel’ the changes)–it seems that I’m stuck in an endless loop. I haven’t been able to discover the ‘save’ (in the merge tool) the error highlights.

Thanks in advance for any assistance you may be able to provide.

2

Hi,

Could you let me know how you are invoking the tool, plus which source control system you are using, and what sequence of operations led to the dialog shown above please?

Regards,
Dan
Unity Support