ResolveConflicts classes Reverted back to @ApiStatus.Internal

IntelliJ Platform
1

Hi

On 261 EAP I am not able to release a version because of the following timeline events:

  1. June 2024 — Created by @chris.lemaire with @ApiStatus.Internal
  2. I asked (I think on Slack but can’t confirm this) to change the visibility level.
  3. Dec 2024 — Changed to @ApiStatus.Experimental (commit b9584b41a9ea — “Mark ResolveConflicts classes Experimental”)
  4. Feb 11, 2026 — Reverted back to @ApiStatus.Internal by @ilia.shulgin (commit 4b1d52f6dd79 — “Add API dump for git4idea and fix exposed APIs”)

So these were reclassified to Internal just 3 weeks ago as part of a broad git4idea API cleanup.

Can you please re-expose these as @ApiStatus.Experimental?

I filed an issue on YouTrack:

IJPL-237833

Thanks in advance

Jonathan

@natalia.melnikova- FYI

2

There is currently no public API alternative and no extension point for this functionality.

I would like to comment that this is somewhat invalid argument in this issue. Even if there are no ways to do something, it does not mean that our internal code may be used, especially if it was not designed to be API

3

@yuriy.artamonov I agree, the content was Claude generated - will remove it.

4

@yuriy.artamonov done.

Now for the root issue, what is the suggested way to handle this?

On the one hand, yes, it was Internal → Experimental by my request → and now Internal again

On the other hand, the functionality is there in my plugin, used by the users…

I am not sure how I should proceed with these cases, and what JetBrains expects me, as the plugin Author to do, remove the functionality from the plugin?

5

We usually make it so no new usages allowed and we gradually asking for changes in plugins once we have a way / replacement to proceed

6

Yes but this wasn’t a new usage.

Anyway if there are changes I need to do to keep the feature working but with different APIs please let me know.

Thanks for the help.