Buenas, estoy intentando hacer el git pull para traer los datos de la rama master pero no me funciona, utilizo este comando
git pull servidorlocal master
pero me sale este error
$ git pull servidorlocal master remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 282 bytes | 1024 bytes/s, done. From C:/Users/LUFER/Documents/git-y-github/servidor
- branch master -> FETCH_HEAD
33948a4..8d389e8 master -> servidorlocal/master
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge. Aborting Updating 23405e8..8d389e8index.html
alguna idea de que es ??