Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 322692

Summary: Conflict decorator on auto-merged packages
Product: [Technology] EGit Reporter: Benjamin Muskalla <b.muskalla>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: RESOLVED DUPLICATE QA Contact:
Severity: normal    
Priority: P3    
Version: 0.9.0   
Target Milestone: ---   
Hardware: All   
OS: Linux   
Whiteboard:
Attachments:
Description Flags
screenshot none

Description Benjamin Muskalla CLA 2010-08-13 17:26:21 EDT 
Just did a pull with some conflicts which were auto-merged. But the packages itself still have the conflict decorator which is not correct.
Comment 1 Benjamin Muskalla CLA 2010-08-13 17:27:00 EDT 
Created attachment 176591 [details]
screenshot

.
Comment 2 Benjamin Muskalla CLA 2010-08-13 17:29:01 EDT 
Hm...just realized that there is a conflict in one of the subpackages and this means, this is essentially a dup of bug 318822 :/

*** This bug has been marked as a duplicate of bug 318822 ***