Cuando pongo el comando git pul me trae este mensaje:
$ git pull servidorlocal master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 366 bytes | 21.00 KiB/s, done.
From C:/Users/Tano y Pri/Documents/servidor
* branch master -> FETCH_HEAD
3e08043..1fc4984 master -> servidorlocal/master
error: Your local changes to the following files would be overwritten by merge:
index.html
Please commit your changes or stash them before you merge.
Aborting
Updating b1d809f..1fc4984