Merge pull request #480 from jtemporal/copilot/translate-card-049-to-spanish

Translate card 049 to Spanish

Author: jtemporal

_posts/2023-08-03-049.md

@@ -15,6 +15,8 @@ use_static_image: true
 translations:
 - lang: en
   url: /en/049
+- lang: es
+  url: /es/049
 permalink: "/projects/049"
 lang: "pt"
 pv:

assets/img/mermaid/049-es.svg

@@ -10,9 +10,12 @@ descriptors:
 author: "@jtemporal"
 number: "049"
 mermaid: true
+use_static_image: true
 translations:
 - lang: pt
   url: /projects/049
+- lang: es
+  url: /es/049
 permalink: "/en/049"
 lang: "en"
 pv:

en/_posts/2023-08-03-049.md

@@ -0,0 +1,30 @@
+---
+layout: post
+pretitle: Haciendo el
+title: merge
+subtitle: de dos ramas
+command: git merge origen destino
+descriptors:
+  - command: comando para\nunir ramas
+  - part1: rama con los cambios\na aplicar
+  - part2: rama que debe\nrecibir los cambios
+author: "@jtemporal"
+number: "049"
+mermaid: true
+use_static_image: true
+translations:
+- lang: pt
+  url: /projects/049
+- lang: en
+  url: /en/049
+permalink: "/es/049"
+lang: "es"
+pv:
+  url: "/es/048"
+  title: "#048 git branch -M nombre"
+nt:
+  url: "/es/050"
+  title: "#050 git pull remote branch"
+---
+
+{% include mermaid-graphs.html %}

es/_posts/2023-08-03-049.md

@@ -22,7 +22,7 @@ permalink: "/es/050"
 lang: "es"
 pv:
   url: "/es/049"
-  title: "#049 git merge source target"
+  title: "#049 git merge origen destino"
 nt:
   url: "/es/051"
   title: "#051 git commit --allow-empty"