Feature request for solving tree conflicts

[Sebastian Müller]

Hi, it would be great if checking tree conflicts during a merge could be speed up.

Current state is:

conflicts during a merge are solved one after another. If the current one is a tree conflict, then first the "Fetching tree conflict information..." dialog appears, and only after it is finished the solving dialog "A merge operation tried to edit a file" is shown.

My problem now is, that the "Fetching" dialog can take some time, sometimes up to a minute. And if there are many tree conflicts, I have to wait very long.

Could the fetching of the conflict information be done asynchronously in the background while I solve the other conflicts? So only if it is not finished when I reach a tree conflict the fetching dialog appears, and else directly the solving dialog is shown.

Thank you very much.

Sebastian

[Stefan]

pre-fetching won't really work, because once you solved the first tree conflict, the data fetched for the second one will be different depending on how you resolved the first one.