I have been using Rubymine v.6.0.2. I tried to merge 2 branch. I know there would be a conflict but when I tried to merge the branch. I got this pop up window ( see attachedment) . says "Your local changes to the following files would be overwritten by merge .... etc. but there are no files listed in the center it says "No differences" and there are 3 button Force Merge, Smart Merge and Dont Merge. I tried the two button Force Merge and Smart Merge it just give me an error "Couldn't merge ....". Any Idea how to resove this issue? Thanks in advance!
Attachment(s):Screenshot from 2014-01-22 08:12:11.png