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?
请先登录再写评论。
Hello Chez,
RubyMine should ask you to resolve merge conflict exactly the described way. Doesn't it work?
Regards,
Oleg
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?
Chez,
I've asked responsible developer to comment this.
Regards,
Oleg
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
When I right-click and expand git, I see "Compare with" commands but they show pair diffs.