Comentar bloque y borrar salida del comando

fraya · Jul 31, 2024 · 32a1666 · 32a1666
1 parent c1f7435
commit 32a1666
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/documentation/source/git-ramas.rst b/documentation/source/git-ramas.rst
@@ -469,12 +469,9 @@ Y resolvemos el conflicto confirmando los cambios:
    $ git checkout main
 
 .. code-block:: console
+   :caption: Fusionamos las ramas una vez solucionado el conflicto
 
    $ git merge saludo-moderno
-   Updating c2c80fa..b829314
-   Fast-forward
-    source/app/curso-de-git-app.dylan | 2 +-
-    1 file changed, 1 insertion(+), 1 deletion(-)
 
 Rebasing vs Merging
 ~~~~~~~~~~~~~~~~~~~