Bug 516259 - Allow to resolve multiple conflicts with one click
Summary: Allow to resolve multiple conflicts with one click
Status: ASSIGNED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Philip Langer CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-05-05 11:23 EDT by Philip Langer CLA
Modified: 2018-03-15 09:53 EDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Philip Langer CLA 2017-05-05 11:23:17 EDT 
Especially with large comparisons that contain many conflicts, users would like to be able to resolve conflicts for an entire component, diagram, etc. with "one click" by preferring one side over the other.

This action would essentially be accepting all left or right conflicting changes.

This way, a user could just merge a component/diagram by saying that he/she would like to accept all conflicting changes from left/right and then merge all contained non-conflicting changes.
Comment 1 Eclipse Genie CLA 2017-08-11 11:50:12 EDT 
New Gerrit change created: https://git.eclipse.org/r/102981