I have recently observed a very weird merge conflict in Subversion. I am using tortoise SVN as the client. Please find the below information of the Trunk and branch details:
