2019.3 EAP: For git, the "show history" and "show changed files" view panels have changed. Now where are unresolved files listed after a merge?

Answered

Prior to 2019.3 EAP (and possibly even 2019.2.3, I forget), these options just showed a list of changed files. Now there's a more elaborate checkboxed list with a diff on the right, which is fine, but intellij is no longer listing in red any files that were not merged properly. Everything appears under "default changelist" and the file with merge conflicts is blue like all the others.

If it makes any difference, I performed the merge command outside of intellij and am just using intellij to look at the changes.

 

IntelliJ IDEA 2019.3 EAP (Ultimate Edition)
Build #IU-193.2956.37, built on September 10, 2019
IntelliJ IDEA EAP User
Expiration date: October 10, 2019
Runtime version: 11.0.4+12-b462.3 amd64
VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o
Windows 10 10.0
GC: ParNew, ConcurrentMarkSweep
Memory: 2014M
Cores: 4
Registry: ide.appIcon.requestAttention=false
Non-Bundled Plugins: FindBugs-IDEA, VisualVMLauncher, com.mnw.tabmover, com.jetbrains.upsource, luonq.ScrollFromSource, BashSupport, cz.daku.intellij.extraActions, org.turbanov.run.configuration.as.action

1 comment
Comment actions Permalink

History view has not changed recently.

 

> a more elaborate checkboxed list with a diff on the right

You probably refer to committing from Local changes option, but how is it related to Shows History?

 

> but intellij is no longer listing in red any files that were not merged properly

This has not changed, and non-merged files are listed, marked in red, and a link to resolve conflicts is there

 

> I performed the merge command outside of IntelliJ

Probably, external changes have not been correctly refreshed. Check if Refresh action (from the toolbar) helps

0

Please sign in to leave a comment.