Ticket #492 (new enhancement)
Option to merge/customize conflicting records
| Reported by: | puck | Owned by: | |
|---|---|---|---|
| Priority: | high | Milestone: | OpenSync 0.41 |
| Component: | OpenSync | Version: | 0.38 |
| Severity: | normal | Keywords: | |
| Cc: | tuju@… |
Description
Currently if a conflict is detected the only option is to pick one or the other of the conflicting records (or neither). This isn't satisfactory if you've modified the record on both devices (i.e., the phone number on my cellphone, the email address on my computer).
What would be nice is to have an option of merging records, then replacing the record on both devices with the merged record. The interface would hopefully show the details from both records and then you can pick which ones to put into the new record.
This is a general GUI request.
Attachments
-
customized_entry.diff
(6.2 KB) -
added by dgollub 4 years ago.
- Initial patch for customizing entries as conflict resolution.
Change History
comment:1 Changed 5 years ago by dgollub
- Owner changed from abauer to dgollub
- Status changed from new to assigned
- Summary changed from Option to merge conflicting records to Option to merge/customize conflicting records
- Milestone set to 0.30
Changed 4 years ago by dgollub
-
attachment
customized_entry.diff
added
Initial patch for customizing entries as conflict resolution.
comment:4 Changed 4 years ago by dgollub
- Priority changed from normal to high
- Version changed from 0.30 to 0.33
- Milestone set to OpenSync 0.40
Work in progess - initial attached patch completely untested.
Note: See
TracTickets for help on using
tickets.
Great idea! At the moment i am working on the reimplementation of "Ignore" conflict and "Newest Entry" in 0.30. If there is enough time i will try to provide "Customized Entry". I would suggest to make the merge in the frontend. The user decide if the merge was correct. If not the user should be able to edit the entry in the UI .. thats the reason to call this "Customized Entry".
Independent of calling it "Merge"/"Customized" Conflict solving.. for the framework we only have to provide a conflict handler which takes a new xmlformat-$objtype and use it as (master mapping) solving entry.