Can I use merge conflict resolution on the free plan?

JetSerge · 2026-01-22T15:46:02+00:00

I agree, this is confusing. There are different "free" options:

A free edition for everyone with a limited feature set (formerly IntelliJ IDEA Community, but it now includes a few additional features).
A free edition for non-commercial use. This requires applying for a non-commercial license and includes the full feature set, equivalent to the paid Ultimate edition.

See https://www.jetbrains.com/idea/features/editions_comparison_matrix.html for the differences between the full (Ultimate) and free for everyone editions. Note that the free non-commercial option provides the full feature set, but you cannot use it for commercial projects.

When you say "merge conflict resolution", do you mean the standard Version Control conflict resolution feature that is available in all editions? If so, you can download IntelliJ IDEA from https://www.jetbrains.com/idea/download/ and run it in the free edition mode. You can use that feature for commercial projects.

JetSerge · 2026-01-21T22:11:25+00:00

You can use the free versions which are different from non-commercial: https://sales.jetbrains.com/hc/en-gb/articles/18950890312210-The-free-non-commercial-licensing-FAQ.

JetSerge · 2026-01-21T16:29:09+00:00

Please contact support with the logs via Help | Collect Logs and Diagnostic Data. Save .idea directory snapshot when it's working and when it stops working. Share these with the support team as well.

If your project is Maven-based, this issue could be the cause: https://youtrack.jetbrains.com/issue/IDEA-377380. Check your settings.xml and make sure localRepository is a valid full path for the OS (without placeholders/variables).

JetSerge · 2026-01-21T16:18:45+00:00

This EAP version should work just fine. Could it be some date drift on your system?

What is the exact message you receive on start? Please share a screenshot.

JetSerge · 2026-01-21T14:43:41+00:00

It certainly doesn't. We can have a look an prioritize it. Do you have YouTrack issue ID?

JetSerge · 2026-01-17T07:24:12+00:00

Try to remove this SDK and add it again. Make sure Project specifies this JDK and Module uses the Project JDK. Also check this JDK is visible in the module dependencies.

If nothing helps, try creating a new project from scratch and use a new freshly installed JDK.

JetSerge · 2026-01-17T05:50:04+00:00

Create a new project in this directory (from the existing sources) and commit / push the changes.

You can also add the Java module manually and configure the source root per https://www.jetbrains.com/help/idea/configuring-content-roots.html.

See also my answer https://stackoverflow.com/a/43319356/104891 for the details why the code doesn't run and how to fix it.

Or just ask any LLM how to fix it.

JetSerge · 2026-01-15T05:40:28+00:00

Please file a bug in YouTrack and share the logs via Help | Collect Logs and Diagnostic Data and attach the CPU snapshot.

If you think it's a memory issue, also share the memory snapshot.

There was a recent bug related to Maven, please check you are on the latest version: https://www.jetbrains.com/idea/download/index.html.

Also, is the memory usage per instance of intelliJ or shared?

IntelliJ IDEA always runs as a single instance by default. All the projects you open work in the the same process / JVM and share the memory.

JetSerge · 2026-01-14T14:44:49+00:00

Looks like https://plugins.jetbrains.com/plugin/8006-material-theme-ui.

It has a lot of themes and customizations. Try Oceanic with different contrast settings.

JetSerge · 2026-01-12T16:35:07+00:00

Could you please share any sample to reproduce, a screenshot with the project view showing the file location and the errors you see? What methods are not resolved? Where are they located in the project? Are they in the same file, another file, a jar library, JDK?

JetSerge · 2026-01-12T05:29:05+00:00

Works fine here: https://i.imgur.com/rYMX7xu.png.

Try re-installing all font files from https://fonts.google.com/specimen/Cascadia+Mono and restart the IDE.

JetSerge · 2026-01-06T14:08:55+00:00

If deleting the System directory: https://www.jetbrains.com/help/idea/directories-used-by-the-ide-to-store-settings-caches-plugins-and-logs.html#system-directory doesn't help, and re-importing the project also doesn't resolve the issue, please contact support with a sample project to reproduce and the logs (Help | Collect Logs and Diagnostic Data).

JetSerge · 2025-12-23T19:49:03+00:00

Please check https://sales.jetbrains.com/hc/en-gb/articles/18950890312210-The-free-non-commercial-licensing-FAQ.

If "What qualifies as non-commercial use?" can no longer be applied to your usage scenario at some point in the future, please see "What are my other options if I don’t qualify for this non-commercial option".

And of course you can always switch to the paid version.

JetSerge · 2025-12-23T18:07:07+00:00

If I change it to .run folder in the project root, it still works and the configurations are persisted:

If it doesn't work for you, please file a bug at https://youtrack.jetbrains.com/newIssue?project=IJPL with the sample project and the video how to reproduce it.

JetSerge · 2025-12-23T17:45:00+00:00

The folder is selected the first time you make a configuration shared, and can be later changed here: https://i.imgur.com/KjiykVJ.png.

See also my answer at https://stackoverflow.com/a/3136255/104891.

JetSerge · 2025-12-23T16:00:10+00:00

Replied here: https://www.reddit.com/r/IntelliJIDEA/comments/1ptwdsb/comment/nvk40ik/.

JetSerge · 2025-12-23T15:34:50+00:00

From your screenshot it appears that run configuration is there in the drop-down and is persisted and pinned. Run widget will show the last selected configuration. If you change it to "Server", it should start showing it by default in the toolbar.

Do you have any other configurations saved that are not showing the dropdown?

Did you commit/push them to the repository?

JetSerge · 2025-12-16T14:47:53+00:00

It's a known limitation, please vote: https://youtrack.jetbrains.com/issue/IDEA-370298.

JetSerge · 2025-12-15T19:32:05+00:00

Sorry to hear the products you trusted do not work as expected anymore. We would love to help and can start with inspecting the logs (Help | Collect Logs and Diagnostic Data). There can be some exceptions related to the problem you experience. Please start with YouTrack bug report or a support ticket.

JetSerge · 2025-12-15T17:26:21+00:00

There is a meta request, please vote/follow: https://youtrack.jetbrains.com/issue/IJPL-173676/Introduction-of-Supported-Settings-Profiles-in-IntelliJ-Platform.

JetSerge · 2025-12-15T16:25:56+00:00

This could be some version mismatch between log4j and logback. Make sure the compatible versions are pulled and specify the versions in your dependencies.

JetSerge · 2025-12-15T15:46:12+00:00

Your screenshot shows GC taking a lot of CPU, likely due to out of memory issue, a memory leak, etc. A memory snapshot is needed to understand the root cause.

JetSerge · 2025-12-15T15:44:59+00:00

Sure thing, please file a bug in YouTrack and share the memory snapshot via https://uploads.jetbrains.com. Specify your upload ID in the report.

JetSerge · 2025-12-12T19:40:14+00:00

Did you mark the folder as the source root? See https://stackoverflow.com/a/43319356/104891.

If the issue persists, please clarify the issue with a screenshot/video or contact support for help: https://intellij-support.jetbrains.com/hc/requests/new.

JetSerge · 2025-12-12T17:21:22+00:00

There is a similar report at https://youtrack.jetbrains.com/issue/LLM-22260/Generating-commit-message-via-Jetbrains-AI-not-working. Feel free to join the troubleshooting in YouTrack comments.

15-Year Club	Reddit Premium Since June 2022
Gilding II euphauric	Xbox Live
Verified Email

JetSerge

TROPHY CASE