Sou iniciante no git e possuo umas duvidas,
1 - Já criei meu repositorio no GitHub e adicionei: README.md e .gitIgnore
2 - Já adicionei os os arquivos e já commitei.
3 - Na hora de dar o git push origin master, estou com esse erro:
Username for 'https://github.com': daysonmota
Password for 'https://daysonmota@github.com':
To https://github.com/daysonmota/CrossCode-Exercicios.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/daysonmota/CrossCode-Exercicios.git'
dica: Updates were rejected because the remote contains work that you do
dica: not have locally. This is usually caused by another repository pushing
dica: to the same ref. You may want to first integrate the remote changes
dica: (e.g., 'git pull ...') before pushing again.
dica: See the 'Note about fast-forwards' in 'git push --help' for details.
4 - fiz o git pull origin master e apresentou esse erro:
Triadworks$ git pull origin master
error: Pulling is not possible because you have unmerged files.
dica: Fix them up in the work tree, and then use 'git add/rm <file>'
dica: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Não sei o que posso fazer para tentar resolver.