divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (titulo) $ git status On branch titulo Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: index.html
no changes added to commit (use "git add" and/or "git commit -a")
divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (titulo) $ git add index.html
divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (titulo) $ git commit -m "Cabeza con la letra mayúscula" [titulo d7d8ccf] Cabeza con la letra mayúscula 1 file changed, 1 insertion(+), 1 deletion(-)
divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (titulo) $ git checkout master Switched to branch 'master'
divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (master) $ git rebase titulo Auto-merging index.html CONFLICT (content): Merge conflict in index.html error: could not apply d1c1c50... Corrigiendo el nombre del curso Docker hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d1c1c50... Corrigiendo el nombre del curso Docker
divi@DESKTOP-STVK7F8 MINGW64 ~/ClasesAlura/Curso_Git/Christian (master|REBASE 1/1)
