How can I mark a single file as unresolved after a failed merge in git?

Posted by forki23 on Stack Overflow See other posts from Stack Overflow or by forki23
Published on 2010-06-07T07:29:11Z Indexed on 2010/06/07 7:32 UTC
Read the original article Hit count: 355

Filed under:
|
|

Hi,

at the moment I'm merging a very large project and unfortunately I have lots of conflicts. After merging some files I realized that I made merge errors in a specific file and now it is marked as resolved. How can I unresolve it in git in order to merge it again.

I tried git reset --hard -- myFile.txt but it doesn't work.

Regards, Steffen

© Stack Overflow or respective owner

Related posts about git

Related posts about merge