Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?

[Steinar Bang]

>>>>> Alan Mackenzie <address@hidden>:

> I did a git stash, followed by git merge, followed by git stash pop.
> This caused a conflict in .gitignore, which I repaired by editing
> that file.

> I think (but I'm not sure), I need somehow to tell git that the file has
> been fixed.

 git add .gitignore

If that was the only conflict, then
 git commit
(just use the default message that will pop up in the editor you've set
 in the EDITOR environment variable)

After that, if you wish to immediately publish your merge:
 git push