Git merge stuck in EAP PS-89.240

Hi,

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.

Best,

Dirk Louwers

4 comments
Comment actions Permalink

Hi Dirk,

I would recommend you to force quit IDEA, resolve merge from console, start IDEA.
Maybe IDEA will reindex all files, but it should be fine from the Git point of view.

Tell me if you need assistance in merging files by hands from terminal.

0
Comment actions Permalink

Hi,

I have exited the IDE. After manually comitting and restarting the IDE it looks like the merge hasn't been done.
When I now choose Git->Merge changes... I only get to choose a single branch, not the branch I want to merge with.
Will try from the command-line as well.

Best,

Dirk Louwers

EDIT: No idea what went wrong, Reverted to last revision and did the merge again from the commandline.

0
Comment actions Permalink

Hi,

This issue crops up anytime I do a merge with conflicts. Will revert to using git externally and restarting the IDE untill the next release.

Best,

Dirk Louwers

0

Please sign in to leave a comment.