Clicking on the conflict notification gives no way of solving the conflict

[ChildishGiant]

I would imagine it's supposed to open an option where you can choose which version to keep?

[PhieF]

Hi

Yes it should, in fact for now it is an indicator, the conflict is automatically fixed by... keeping both files

I will try to improve this!

thanks !