en la parte 5:15 se muestar un corte de pantalla, yo al escribir git pull me aparecio $ git pull servidorlocal master remote: Enumerating objects: 13, done. remote: Counting objects: 100% (13/13), done. remote: Compressing objects: 100% (9/9), done. remote: Total 9 (delta 3), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (9/9), 1.04 KiB | 75.00 KiB/s, done. From C:/Users/juand/Documents/practicagit/servidor
- branch master -> FETCH_HEAD 4b45237..001bb1c master -> servidorlocal/master Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.
pero a ti te aparecio otra cosa con el salto del video
