IntelliJ Idea with Git: when automatic merge crashed, how can I continue to merge manually

Question

I use IntelliJ Idea with Git. When I pull from repository, I get following error:

" ...CONFLICT (content): Merge conflict in server..."

Then pull fails.

Questions are:

1. Does IntelliJ Idea displays any log of what happend exactly? How do I see it?
2. How can I continue merge manually from the same point (where it failed)?

Solution

Looks like you've got a conflict during merge. Go to the Changes View and see if there are any unmerged files. Then invoke Resolve Conflicts, choose what to take from your changes and theirs, and commit.

You may also want to try Update Project for more intelligent pulling from the tracked branch.