You mean that you’re opening the file with the merge conflict still present in the IntelliJ editor? i.e. not using the IntelliJ merge dialog?

yeah

I’ve never really used IntelliJ git interface for that

I recommend it, it’s great, but what you’re doing shouldn’t break things either. Could you file an issue for that so it doesn’t get lost?

ok

I’m not sure how best to handle that, but I’ll see what I can do. Do you have the Git plugin installed and enabled?

I haven’t installed any Git plugins specifically

it says here that it’s bundled

so I’m guessing it’s automatically installed

Yes, it’s installed and enabled by default. Being able to detect merge conflicts quickly enough for parinfer purposes will probably rely on that, since I’m sure they index which files have conflicts.

Not directly addressing your question, but have you tried if (set! *print-length* 20) (or some other value) avoids the freezing? Edit: Demonstration:

(do (set! *print-length* 20) (println (range 1e9)))
(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 ...)
=> nil

yes I know that but I always always forget

and I feel like in 2020 this shouldn't be so primitive

I’m planning a fix to allow stopping printing of the last eval result. However if you kick off something in a background thread which prints a lot, there’s really no useful way to stop that.