Which command marks config.ini as resolved?
$ git merge feat CONFLICT (content): Merge conflict in config.ini # ...edit config.ini and remove the markers...
git resolve config.inigit merge --skipgit commit config.inigit add config.ini
Staging the file records the resolution in the index; then
Play Git ▸
git commit (or git merge --continue) concludes the merge. There is no git resolve command.