git merge¶

[gomix@movix software-management-guide]$ git branch 
  f15
  f16
* master
  rebase
[gomix@movix software-management-guide]$ git merge f16   ;fusionar cambios de la rama f16 en la rama master
Auto-merging es-ES/Book_Info.xml
CONFLICT (content): Merge conflict in es-ES/Book_Info.xml
Auto-merging .tx/config
CONFLICT (add/add): Merge conflict in .tx/config
Automatic merge failed; fix conflicts and then commit the result.

git diff

[gomix@movix software-management-guide]$ git diff
diff --cc .tx/config
index 27fdd0d,02165aa..0000000
--- a/.tx/config
+++ b/.tx/config
@@@ -1,3 -1,5 +1,8 @@@
  [main]
  host = https://www.transifex.net
  lang_map = aln:aln-AL, ar:ar-SA, as:as-IN, bal:bal-PK, bg:bg-BG, bn:bn-BD, bn_IN:bn-IN, bs:bs-BA, ca:ca-ES, cs:cs-CZ, da:da-DK, de_CH:de-CH, de:de-DE, el:el
++<<<<<<< HEAD
++=======
+ 
+ 
++>>>>>>> f16
diff --cc es-ES/Book_Info.xml
index 7a7d587,6f94e65..0000000
--- a/es-ES/Book_Info.xml
+++ b/es-ES/Book_Info.xml
@@@ -6,10 -6,10 +6,17 @@@
  <bookinfo id="book-Manual_para_gestion_del_software-Manual_para_gestion_del_software">
        <title>Manual para gestión del software</title>
        <subtitle>La guía definitiva para la gestión del software</subtitle>
++<<<<<<< HEAD
 +      <productname>Fedora 17</productname>
 +      <productnumber></productnumber>
 +      <edition>1</edition>
 +      <pubsnumber>0</pubsnumber>
++=======
+       <productname>Fedora</productname>
+   <productnumber>16</productnumber>
+       <edition>1.0</edition>
+   <pubsnumber>0</pubsnumber>
++>>>>>>> f16
        <abstract>
                <para>Este manual está ded

Le mostrará los archivos en problemas, edítelos, y agreguélos o remuévalos (git add/rm) para resolver el conflicto, luego simplemente git commit -a.