|
| 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 01:43:47 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
Hi Alan, On 05/27/2015 01:39 AM, Alan Mackenzie wrote:
but the suggested recipe, as far as I am aware, doesn't "mark resolution", instead it moves a file into a list of files to be committed in the (?near) future.
It does both.
Do I actually need to tell git that the merge conflicts in .gitignore have been fixed?
Need for what?
| [Prev in Thread] | Current Thread | [Next in Thread] |