I have just performed two merges. The second merge has been running for 20 minutes straight! Status bar keeps showing "Merging..." and the VCS Console log shows it is repeatedly sending the same "git log" command 11 times followed by a "git rev-list" command and then continuing with repeated "git log" commands again. It looks like an indefinite loop to me. I am afraid to stop the process since I have had issues where I had to force quit the IDE, causing very disrupting state related issues upon restart. Please advise.