Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 360966 - Handle empty conflict
Summary: Handle empty conflict
Status: RESOLVED FIXED
Alias: None
Product: EMFStore
Classification: Modeling
Component: ServerCore (show other bugs)
Version: unspecified   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Edgar Mueller CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-14 09:42 EDT by Edgar Mueller CLA
Modified: 2011-10-14 10:24 EDT (History)
1 user (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 Edgar Mueller CLA 2011-10-14 09:42:16 EDT 
If conflicts can be resolved automatically an empty merge dialog is shown regardless
Comment 1 Edgar Mueller CLA 2011-10-14 10:24:24 EDT 
Empty conflicts will no longer cause the MergeDialog to pop up