gracias Miguel, espero haber realizado los pasos correctos
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master|MERGING)
$ git push servidorlocal master
To d:/oracle/github/servidor/
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'd:/oracle/github/servidor/'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master|MERGING)
$ git pull servidorlocal master
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master|MERGING)
$ git add index.html
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master|MERGING)
$ git status
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master|MERGING)
$ git commit
[master 7d01bb2] Merge branch 'master' of d:/oracle/github/servidor
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master)
$ git status
On branch master
nothing to commit, working tree clean
rafael@LAPTOP-xxxxxxxx MINGW64 /d/oracle/github/rafael (master)
$ git push servidorlocal master
Enumerating objects: 31, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 12 threads
Compressing objects: 100% (27/27), done.
Writing objects: 100% (27/27), 2.99 KiB | 766.00 KiB/s, done.
Total 27 (delta 8), reused 0 (delta 0), pack-reused 0
To d:/oracle/github/servidor/
a70e681..7d01bb2 master -> master
