1
resposta

MERGE

Estou tentando terminar esse curso, mas tá foda, dessa vez apareceu isso em vez daquele tela azul, oque teria sido ?

mateus@DESKTOP-FSJOKEE MINGW64 ~/documents/tentativa/carol/azul (master|MERGING)
$ git commit
hint: Waiting for your editor to close the file... error: cannot spawn Sublime: No such file or directory
error: unable to start editor 'Sublime'
Please supply the message using either -m or -F option.

Em outro momento apareceu isso .

$ git pull local master
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
1 resposta

Respondi essa dúvida aqui, Luã: https://cursos.alura.com.br/forum/topico-merge-230988