Comment 3 for bug 174509
Revision history for this message
| Alexander Belchenko (bialix) wrote Re: [Bug 174509] Re: qcommit: Add a list of conflicts and an option to launch a merge tool to resolve them | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
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.