git reset ---hard returns error

Question

I am git newbie. When I hope to reset hard to discard all local modification, git return merge conflict

HEAD is now at 3291a25 will create merge conflict 1

my operation:

about half a month I commit as below

git commit -am "will create merge conflict 1"

today I hope to reset --hard to this ref

yaoyangyong@ubuntulucky:~/repos01$ git reset --hard HEAD
HEAD is now at 3291a25 will create merge confict 1

The output confuse me. In fact, it is just my old comment.

do you had deleted files or untracked files before reseting? — Rito
– Rito, Commented Jun 25, 2012 at 13:17
That output is correct: git is telling you you have reset to the last commit on HEAD and is showing the commit message as a reminder of where you are now. — JoshRagem
– JoshRagem, Commented Jun 25, 2012 at 13:21
Your question has no question in it. Please edit it to make it clear what your asking or it will get flagged. Right now it makes no sense. Like Josh said the output is all good. And your header makes even less sense because you have not provided any printings/output that would demonstrate any errors. If there is an error you should add that to your posting as well. — Timo
– Timo, Commented Nov 12, 2012 at 12:59

Noufal Ibrahim · Accepted Answer · 2012-06-25 13:24:21Z

5

git is simply telling you the result of the reset.

HEAD(your current position) is now at 3291a25(the commit you wanted to reset to) "will create merge confict 1"(the message of the commit).

You should pass a commit which you want to reset to rather than just say HEAD. Also, if you want to abort a half completed merge, use git merge --abort (or git reset --merge in older versions of git).

answered Jun 25, 2012 at 13:24

Noufal Ibrahim

73.2k13 gold badges140 silver badges174 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

git reset ---hard returns error

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related