Erreur lors du commit :
git add ‹ lang/paquet-territoires_data_en.php › ‹ lang/paquet-territoires_data.xml › 2>&1
git commit -m ‹ i18n: [Salvatore] [source:lang/ paquet-territoires_data] Export depuis https://trad.spip.net de la langue en
i18n: [Salvatore] [source:lang/ paquet-territoires_data] Mise a jour du bilan depuis https://trad.spip.net › --author=‹ Eric Lupinacci eric@smellup.net › 2>&1
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‹ git add/rm ›
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
U modeles/graphique.html