|
| 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:56:12 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 03:45 AM, Kelvin White wrote:
If I'm missing something, I apologize in advance, but please explain.
.gitignore is already registered in the repository. 'git rm --cached && git commit' would commit its deletion (even though the file would remain on disk because of '--cached').
The 'git rm' part should be self-evident, isn't it?
| [Prev in Thread] | Current Thread | [Next in Thread] |