[RFC] How to better assist users in resolving conflicts

[Alexander Belchenko]

Vincent Ladeuil пишет:
>>>>>> "bialix" == Alexander Belchenko <bialix at ukr.net> writes:
> 
> <snip/>
> 
>     bialix> We have one: qconflicts.
> 
> Sure. 
> 
> Does it provides actions for tree shape conflicts ? 

Only "mark conflict as resolved".

> If yes, then let's compare notes, if not, can you have a look at
> the patch and tell me if the proposed changes sounds appropriate
> for it.

It can be hard for me in next few days, other work require all my time.
I'll try but the size of your patch is big enough to get me quickly jump 
in and see what you mean. I'll try though.