How do I tell the storm that I've resolved the conflict?

Question

git

Downloaded a new master, created a branch and applied stash (stashed) in this branch. A conflict arose, in the storm of the conflicting blocks left only one. But the file itself is lit red:

i.e. GIT says there is a conflict. How can I tell him that I have already resolved everything?

Answer 1

GIT says there is a conflict. How can I tell him that I have already resolved everything?

Tell git (after git stash pop) -- git reset [<имя файла>].