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

Bug 342873

Summary:	New[Client]Need to mark a conflicting file in navigator.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Client	Assignee:	Project Inbox <orion.client-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	normal
Priority:	P3	CC:	bokowski, simon_kaegi
Version:	0.2
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description libing wang

2011-04-14 14:19:31 EDT

Currently if you have a conflicting file after git merge , in the git status page you will see that file is marked as conflicted.
We need to do the same thing in the navigator as well.
Refer to bug 339045

Comment 1 Boris Bokowski

2011-04-15 15:59:21 EDT

I would like to defer this because it's a slippery slope. Why is it not good enough to see the conflict on the git status page? If I use the git command line client, I don't see the conflict either when using "ls", or the file explorer.

Comment 2 John Arthorne

2011-10-27 15:49:08 EDT

Not going there.