Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 342873 - New[Client]Need to mark a conflicting file in navigator.
Summary: New[Client]Need to mark a conflicting file in navigator.
Status: RESOLVED WONTFIX
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-14 14:19 EDT by libing wang CLA
Modified: 2011-10-27 15:49 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 libing wang CLA 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 CLA 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 CLA 2011-10-27 15:49:08 EDT 
Not going there.