Menu
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?
837
Use Find Action, ⇧⌘A (MacOS) or Shift+Ctrl+A (Windows/Linux), to search for any action in IntelliJ IDEA. The drop down will show not only the actions, but also the shortcut so that we can learn this shortcut and practice it. Find action will let us search for actions of course, but also settings so we can change settings directly from here.
For IntelliJ IDEA to identify which logs to show, you need to specify them in the respective run/debug configuration. Run configurations are currently being redesigned: some configurations are updated and some are still in the old design. Use the procedure that corresponds to the appearance of the required configuration.
We can view the most recently opened files using ⌘E (MacOS) or Ctrl+E (Windows/Linux). This pops up the recent files box which you can navigate using arrow keys. We can also open tool windows from here, including ones that don’t have keyboard shortcuts. Like any window in IntelliJ IDEA we can search for something specific in here by typing.
On macOS computers, the Alt key is typically called Option. We'll still call it Alt in this article to keep our shortcuts brief. 3. Settings Let's start with configuring IntelliJ IDEA and our project. We reach the settings of IntelliJ in Windows with File – Settings (Ctrl + Alt + S) and in macOS with IntelliJ IDEA – Preferences (Cmd + ,).
There is an official FAQ document for this problem:
78
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
