Me marca conflicto y no puedo resolverlo, he intentado varias opciones sin resultado. comparto código.
Lenovo@METLIFE-MIDORI MINGW64 ~/documents/practicas_git (master|REBASE 1/2)
$ git commit -m "esperado para rebase"
interactive rebase in progress; onto 11cca5c
Last command done (1 command done):
pick a409644 Modificando el contenido del curso de Docker
Next command to do (1 remaining command):
pick 19207c6 Agregando modificación a Dockers
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'master' on '11cca5c'.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
nothing to commit, working tree clean
Gracias de antemano.
