LoganBarnettASU Posted May 25, 2012 Report Share Posted May 25, 2012 I'm trying to checkin some changes and deletes. It brings up a merge window. This is ok since someone else made some changes recently and understandably I have to do a merge. I click Merge Now. I'm then delivered to the merge conflict window. It says "The merge search has finished. No merges have been detected.", but if I go press Process all merges, nothing happens. Closing the window just allows me to start this process all over again. I tried changing the merge options and clicking Recalculate merge anytime I made a change but I haven't been able to make it show any conflicts or otherwise allow me to proceed. The other person's commit is over some files I didn't change so it should auto-merge just fine. Is this somehow intended behavior or a bug? If it is a bug, what can I do to move forward? A screenshot is attached. Link to comment Share on other sites More sharing options...
This topic is now archived and is closed to further replies.