[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: welate has faced comflict
From: |
Luis Falcon |
Subject: |
Re: welate has faced comflict |
Date: |
Mon, 1 Jan 2024 09:24:33 +0000 |
Hi there!
On Sun, 31 Dec 2023 08:20:43 +0800 (CST)
tumashu <tumashu@163.com> wrote:
> welate has faced comflict
>
>
> merging tryton/health/locale/sv.po
> merging tryton/health_icd10/locale/sv.po
> merging tryton/health_icd10/locale/sv.po failed!
> 46 files updated, 1 files merged, 0 files removed, 1 files unresolved
> use 'hg resolve' to retry unresolved file merges or 'hg merge
> --abort' to abandon (1)
Seems like the issue comes after reinstating Swedish translation. Can
you roll back the Swedish to the previous changeset? I'll try to push it
from there.
Bests
Luis
- Re: welate has faced comflict,
Luis Falcon <=
- Re:Re: welate has faced comflict, tumashu, 2024/01/01
- Re:Re:Re: welate has faced comflict, tumashu, 2024/01/02
- Re: welate has faced comflict, Luis Falcon, 2024/01/02
- Re: welate has faced comflict, Feng Shu, 2024/01/02
- Re: welate has faced comflict, Luis Falcon, 2024/01/03
- Re: welate has faced comflict, Feng Shu, 2024/01/03
- Re: welate has faced comflict, Feng Shu, 2024/01/04
- Re: welate has faced comflict, Luis Falcon, 2024/01/04
- Re: welate has faced comflict, Feng Shu, 2024/01/10
- Re: welate has faced comflict, Luis Falcon, 2024/01/10