Show progress of conflicts being searched/detected

[jelmerdemaat]

As an improvement, it would be really nice if the plugin could show the progress when it is searches for conflicts. I thought there was nothing happening when doing Ctrl + M D at first, so I tried it multiple times. Then a little later, I ended up with five stacked panels containing the found conflicts. Maybe the progress can be shown in the status bar, or in a new conflicts overview tab, like the one you see when searching in a project with Ctrl + Shift + F.

[Nikita240]

+1

[smashwilson]

:+1: Sounds good to me.

It'll take a bit of work so I doubt I'll get to it in the next release or so -- I've been focusing on knocking out some quick fixes for stacktraces people have seen first.

Personally I think I'll put it in the MergeConflictsView, and just hide the progress bar and show the usual merge overview dashboard thingy once everything is loaded.

I thought there was nothing happening when doing Ctrl + M D at first, so I tried it multiple times. Then a little later, I ended up with five stacked panels containing the found conflicts.

That sounds like a race condition, actually. I've got a guard in to prevent multiple MergeConflictViews from spawning, but I bet I'm checking it too late. Hmm.