IntelliJ hangs when resolving merge conflicts in long pascal file

casteng / i-pascal

A free Object Pascal language plugin for IntelliJ IDEA

112 stars 33 forks source link

IntelliJ hangs when resolving merge conflicts in long pascal file #35

Closed dagi12 closed 5 years ago

dagi12 commented 6 years ago

Happens to me recently when resolving conflict in files with 2000+ . Everything is fine until you try to accept left/right side of 3-way merge tool. Then application hangs with 100% processor usage.

casteng commented 6 years ago

Is it reproducible? Can you please attach idea.log file which can be found with "Help->Show log..." just after the hang?

casteng commented 5 years ago

Fixed some deadlocks in v.2.20