oh sorry I guess I'm doing too many things at once... git reset file should do what your looking for.
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.