|
| 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 02:05:47 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 01:56 AM, Alan Mackenzie wrote:
How do I tell git the conflict has been fixed - not as a part of doing something else (which must not be done), but as a primitive operation? This surely must be possible in such a sophisticated SCM tool.
'git reset' will also do the trick.
| [Prev in Thread] | Current Thread | [Next in Thread] |