|
| From: | Steinar Bang |
| Subject: | Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
| Date: | Thu, 28 May 2015 08:30:43 +0200 |
| User-agent: | Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) |
>>>>> Kelvin White <address@hidden>: > Forgive me, but I think the confusion here is due to the fact that > `git reset <file>' will remove it from the curennt index, (I think it is less confusing to say: unstage it from commit)
| [Prev in Thread] | Current Thread | [Next in Thread] |