Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 343901 - [Client]Git status: Resolve conflict action needs to do commit if there is no staged files.
Summary: [Client]Git status: Resolve conflict action needs to do commit if there is no...
Status: CLOSED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 0.2   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-26 15:43 EDT by libing wang CLA
Modified: 2011-09-01 11:41 EDT (History)
0 users

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-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 CLA 2011-04-26 15:46:03 EDT 
fixed with 91be6b9117d1f43a25063f57ad710015ece54572