|
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 05:02:09 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 04:57 AM, Kelvin White wrote:
Maybe this can clarify my point better. http://stackoverflow.com/questions/5798930/git-rm-cached-x-vs-git-reset-head-x
This is the last sentence in the top answer: """ A commit now will sync the index and tree and the file will be removed. """
[Prev in Thread] | Current Thread | [Next in Thread] |