$ ./guess_the_languageGit
Git · easy · #15

Which command marks config.ini as resolved?

$ git merge feat
CONFLICT (content): Merge conflict in config.ini
# ...edit config.ini and remove the markers...
  1. git resolve config.ini
  2. git merge --skip
  3. git commit config.ini
  4. git add config.ini
Staging the file records the resolution in the index; then git commit (or git merge --continue) concludes the merge. There is no git resolve command.
Play Git ▸