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

Bug 343961

Summary:	[Client]Git status:Need support to overwrite local change when conflicts happens
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Client	Assignee:	libing wang <libingw>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	bokowski, Szymon.Brandys, tomasz.zarna
Version:	0.2
Target Milestone:	0.2
Hardware:	PC
OS:	Windows 7
Whiteboard:
Bug Depends on:	343963, 347079
Bug Blocks:

Description libing wang

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

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

2011-06-01 12:03:55 EDT

fixed with eb42acdc7679d8a0729bb331650532a727dc9a8e