|
| From: | Kelvin White |
| 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 01:55:42 +0000 |
On Tue, May 26, 2015, 8:58 PM Dmitry Gutov <address@hidden> wrote:
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?
No, not with " --cached ". It only removes the file from the git "cache" (i.e. staging area)
| [Prev in Thread] | Current Thread | [Next in Thread] |