问题
When merging/rebasing branches I usually press cmd+shift+A and search "Resolve conflicts".
This works once per session and if I do it a second time the following error log pops up, and the cmd+shift+A window closes immediately.
A workaround is to close the project and reopen it (each time I need to resolve conflicts).
Anyone know what is causing this and how I can fix it?
回答1:
There is an official FAQ document for this problem:
来源：https://stackoverflow.com/questions/56054627/intellij-idea-cmdshifta-find-action-causes-error-log-nothing-appropriate