Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 322692 - Conflict decorator on auto-merged packages
Summary: Conflict decorator on auto-merged packages
Status: RESOLVED DUPLICATE of bug 318822
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.9.0   Edit
Hardware: All Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-13 17:26 EDT by Benjamin Muskalla CLA
Modified: 2010-08-13 17:29 EDT (History)
0 users

See Also:

Attachments
screenshot (17.58 KB, image/png)
2010-08-13 17:27 EDT, Benjamin Muskalla CLA 		no flags Details
View All 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 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 ***