Re,
xin:
> Chre:
>> Hi all,
>>
>> xin:
>>> Hello, it's for web/release-3.1 before the release, for master after.
>>>
>>> Repo: https://git-tails.immerda.ch/xin/tails/
>>> Branch: translate/3.1
>>> Last Commit: 67a8d5904bc5051c27bcb19352d366af4188ea6e
>>>
>>> Cheers.
>>> xin
>> Sorry, I have errors here after my `$ git checkout web/release-3.1` :
>>
>>> $ git merge xin/translate/3.1
>>> Fusion automatique de wiki/src/security/Numerous_security_holes_in_3.0.1.fr.po
>>> CONFLIT (contenu) : Conflit de fusion dans wiki/src/security/Numerous_security_holes_in_3.0.1.fr.po
>>> Fusion automatique de wiki/src/news/version_3.1.fr.po
>>> CONFLIT (contenu) : Conflit de fusion dans wiki/src/news/version_3.1.fr.po
>>> La fusion automatique a échoué ; réglez les conflits et validez le résultat.
>> What's wrong? Thanks.
> It's just a conflict with new changes in web/release-3.1.
> I update the branch, please review.
Cheers.
xin
Ok, thanks. May I can do something with git to solve this issue alone?
>
> Last Commit: 8d092b309a5d6bbf4df87fb7c8141a664cf4e1b9
It is ok, please pull.
>
> Cheers.
> xin
>
Cheers.
--
Chre
