Keyboard-shortcuts for merging conflicts
已回答
In IntelliJ's conflict resolution tool, is there a way to trigger the actual merge actions by keyboard, which are usually triggered by clicking the chevrons/"x-es" by mouse?
I don't want to use the mouse when going through the conflicts and merging them together. I see that I can jump from conflict to conflict with F7/Shift-F7, but there seems no way to do the actual action by keyboard, which is really cumbersome.
Thank you
请先登录再写评论。
There are no shortcuts by default, but you could assign whatever you want in Settings - Keymap. Search for Accept Left Side and Accept Right Side
Thank you for this hint! I also found all other actions I could wish for. I found them (IntelliJ IDEA 15.0.3 Win) under:
Version Control Systems -> Diff
The actions are named:
This was very helpful, thank you two
IntelliJ has a very good shortcut coverage by default. I was surprised to discover that merge actions have no default shortcuts...
How about adding F6 to Accept Left and F8 to Accept Right in one of future releases? This way you can put three fingers on F6, F7, F8 and go really fast through conflicts ;)
You are welcome to submit feature requests at https://youtrack.jetbrains.com/issues
That functionality would be awesome. Hope you can have the chance to submit that feature request ;)
Starting with 2019.1, there are default shortcuts fot the Accept Left/Right - Alt+Shift+Right Arrow/Left Arrow on Windows and Linux, and Ctrl+Shift+Right Arrow/Left Arrow on Mac
Also keyboard shortcut to resolve conflicts would be helpful
Hello Tadas,
Please follow: https://youtrack.jetbrains.com/issue/IDEA-227041