> Sorry, but some troubles here:
>
>> $ git merge xin/review/chre/installdownload
>> Fusion automatique de wiki/src/install/inc/steps/download.inline.pt.po
>> Fusion automatique de wiki/src/install/inc/steps/download.inline.html
>> Fusion automatique de wiki/src/install/inc/steps/download.inline.fr.po
>> CONFLIT (contenu) : Conflit de fusion dans wiki/src/install/inc/steps/download.inline.fr.po
>> La fusion automatique a échoué ; réglez les conflits et validez le résultat.
>
> Any idea?
Hello, to solve a conflict you have to use the command "git mergetool"
(the tool I use personally is meld).
I solve conflict and update the file. Please review.
Repo :
https://git-tails.immerda.ch/xin/tails/
Branch : review/installdownload
Last Commit : 37f7e59add9281c13832dc9398193cf3469aa0c5
Cheers.
xin
