Is there a way to get 3-pane merge editor after git cherry-pick?

If from the command line I do a git cherry-pick (or a git merge) that causes a conflict that requires human resolution, is there a way to bring up the nice RubyMine 3-way merged editor on that file?

5 comments
Comment actions Permalink

Hello Chez,

RubyMine should ask you to resolve merge conflict exactly the described way. Doesn't it work?

Regards,
Oleg

0
Comment actions Permalink

I'm talking about when you've done the merge or the cherry-pick from outside of RubyMine (such as from the command line or using GitX).

Moreover, I don't know of a way to do a cherry-pick from within RubyMine... is it possible?

0
Comment actions Permalink

Chez,

I'm talking about when you've done the merge or the cherry-pick from outside of RubyMine (such as from the command line or using GitX).

Moreover, I don't know of a way to do a cherry-pick from within RubyMine... is it possible?


I've asked responsible developer to comment this.

Regards,
Oleg

0
Avatar
Irina Chernushina
Comment actions Permalink

Hello,

For conflict resolution, go to context menu -> Git -> Merge Tool

To cherry pick from RubyMine, go to Changes | Local | Log, find commit you want to cherry pick, select, and use toolbar (or context menu) "Cherry pick" action
It will cherry pick changes to a new changelist, but you will need to commit manually

0
Comment actions Permalink

When I right-click and expand git, I see "Compare with" commands but they show pair diffs.

0

Please sign in to leave a comment.