Hola.
Al realizar el pull al final del video me aparece:
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
Como podria solucionarlo?
usuario@DESKTOP-PN0A2NA MINGW64 /d/Desktop/one/test-git (master) $ 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), 375 bytes | 6.00 KiB/s, done. From D:/Desktop/ONE/servidor
- branch master -> FETCH_HEAD
928525f..b994cb0 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 928525f..b994cb0index.html