Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 343961 - [Client]Git status:Need support to overwrite local change when conflicts happens
Summary: [Client]Git status:Need support to overwrite local change when conflicts happens
Status: RESOLVED 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: 343963 347079
Blocks:
  Show dependency tree
 
Reported: 2011-04-27 10:10 EDT by libing wang CLA
Modified: 2011-09-01 11:42 EDT (History)
3 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-27 10:10:30 EDT 
I just got real world conflicts when fixing bug 343918 .
In my case I had to use "git reset --hard HEAD" to undo my commit and pull again as the incoming changes happened to resolve my issue.
We need a support to let user undo the last commit and pull the change so that the local changes on the client file is overwritten.  If they decide to do so , user does not need to manually resolve the conflict and push if they decide to do so.
Comment 1 libing wang CLA 2011-06-01 10:41:40 EDT 
I will just use "git reset --hard HEAD" to checkout all.
Opened bug 347953 to undo the last commit.
Comment 2 libing wang CLA 2011-06-01 12:03:55 EDT 
fixed with eb42acdc7679d8a0729bb331650532a727dc9a8e