Merge conflict on finish branch should invoke merge tool

[opherv]

Merge conflict on finish branch should invoke merge tool

[joetjen]

You should, in any case, merge the develop branch (or rebase the feature branch if you really want to) into the feature branch you want to finish (assuming that's what you do when you get the "Error") beforehand. But I suppose a more detailed message that "Error" would be nice neverthelesse ;)

[mcv]

Merging the develop branch into the feature branch does not necessarily prevent this problem. Also, it puts git in merge mode, and the file with the conflict has <<<< HEAD stuff in it, so I have to finish the merge at that point, but without nice merge tools.

[OpherV]

@mcv Can you go to version control\console and paste what it says when you get the error?

Also if git is in merge mode you can always use the IntelliJ merge tool with vcs > git > resolve conflicts

[mcv]

In the event log, it simply says: Error

In the console, it says:
Auto-merging test
CONFLICT (content): Merge conflict in test
Automatic merge failed; fix conflicts and then commit the result.
There were merge conflicts. To resolve the merge conflict manually, use:
git mergetool
git commit
You can then complete the finish by running it again:
git flow feature finish baz

When I have a merge conflict with the standard git plugin, it automatically opens IntelliJ's mergetool (yours, theirs, or merge) for me. With this git-flow plugin, it doesn't, and I can't figure out how to do it manually. It'd be nice if you could open the same merge dialog.

[OpherV]

OK, thanks. I'll add a feature that invokes the merge dialog if a conflict arises.
In the meantime you can invoke it manually - top toolbar: vcs > git > resolve conflicts