|
| From: | Dmitry Gutov |
| Subject: | Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
| Date: | Wed, 27 May 2015 03:29:56 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 03:21 AM, Kelvin White wrote:
but in any case `git rm --cached <file>', certainly will.
Have you tried it?That will stage the file for removal, which is almost certainly not what one would want.
| [Prev in Thread] | Current Thread | [Next in Thread] |