|
| 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:38:57 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 03:36 AM, Kelvin White wrote:
I created a new file in a directory under git version control, staged it with `git add <file>', them unstaged it with `git rm --cached <file>'. This is the same behavior you'd expect in this situation.
Well, it's not the same situation as what Alan has with .gitignore.
| [Prev in Thread] | Current Thread | [Next in Thread] |