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

Bug 343901

Summary:	[Client]Git status: Resolve conflict action needs to do commit if there is no staged files.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Client	Assignee:	libing wang <libingw>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3
Version:	0.2
Target Milestone:	0.2
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description libing wang

2011-04-26 15:43:36 EDT

Currently , if you delete a file on the remote and change the same file in the local , we detect a conflict and mark the stage action as "resolve conflict".
But the stage action on such a file does not give a staged status on that file.
User needs to go to git command line to commit it.
For M7 , we will do a special check so that if this case happens we do a commit internally.

Comment 1 libing wang

2011-04-26 15:46:03 EDT

fixed with 91be6b9117d1f43a25063f57ad710015ece54572