qcommit/qbrowse: Show conflict status in file list and an option to launch a merge tool to resolve them

[Lukáš Lalinský]

Would be nice to resolve conflicts from qcommit...

[Alexander Belchenko (bialix)]

may be better do it in separate window qconflicts? Like gconflicts in bzr-gtk?

[Lukáš Lalinský (luks)]

I'll take a look on gconflicts, but I think I'd prefer it in qcommit. And if a separate command, then maybe part of qstatus.

[Alexander Belchenko (bialix)]

Lukáš Lalinský пишет:
> I'll take a look on gconflicts, but I think I'd prefer it in qcommit.
> And if a separate command, then maybe part of qstatus.
>
I don't think we should show gcommit dialog until all conflicts will be
fixed. Also it will be nice to have not only ability to run external
merge tool, but also resolving conflict from GUI window. Especially
non-text conflicts.

[Gary van der Merwe (garyvdm)]

I feel we could create a qmerge wizzard, with 3 steps:

step 1: merge - widget similar to pull
step 2: resolve conflicts - as discussed above.
step 3: commit - show the existing qcommit in the wizzard.

[Alexander Belchenko (bialix)]

Gary, this looks like a good plan.