Ticket #85 (closed enhancement: fixed)
Support resolving conflicts
| Reported by: | apaku | Owned by: | alwin |
|---|---|---|---|
| Priority: | normal | Milestone: | 0.14.x |
| Component: | All | Version: | 0.14.x |
| Severity: | feature | Keywords: | |
| Cc: |
Description
Hi,
I'd really like to see kdesvn support the resolving of conflicts after an update or merge. Currently I have to open my editor and look for the >>>>, but it would be really nice if kdesvn offerend a 3-part view with my local version of the file, the version that comes from the repository (or merge) and the "outcome" of what I'd like to do.
Andreas
Attachments
Change History
comment:1 Changed 7 years ago by apaku
- Owner changed from anonymous to alwin
- Status changed from new to assigned
comment:2 Changed 7 years ago by mariopal
Maybe KDESvn could use kdiff3 if available in the system. It can be an alternative to Kompare, too.
Mario
comment:3 Changed 7 years ago by alwin
For merging conflicts kdiff3 may usable, for displaying diff generated by subversion/kdesvn it isn't usable 'cause it don't take the output generated.
Using kdiff3 for merge conflicts may done that way:
kdiff3 -m <file-left> <file-right> -o <file-with-conflicts>
I think in next bigger release I'll integrate such a call but an own conflict-resolver..... not in 0.9. Or someone write one for kdesvn which work direkt on conflicted merge-result.
