|
| 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 14:34:18 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 02:26 PM, Kelvin White wrote:
This should not remove it from someone's local working copy, only from the repository.
It'll be removed from everyone else's working directories next time they do a pull.
Why are we still discussing this? 'git rm --cached' is obviously not the right solution.
| [Prev in Thread] | Current Thread | [Next in Thread] |