|
From: | Bruno Haible |
Subject: | Re: [bug-gettext] let's release a new version |
Date: | Thu, 25 Oct 2018 15:05:51 +0200 |
User-agent: | KMail/5.1.3 (Linux/4.4.0-137-generic; KDE/5.18.0; x86_64; ; ) |
Hi, Mikko Rantalainen wrote: > Is there any change to include real 3 way merge to next release? > ... > See also: > https://lists.gnu.org/archive/html/bug-gettext/2014-07/msg00007.html > > The original repo seems to have vanished. I published my copy of the > referenced repo to github: > https://github.com/mikkorantalainen/gettext-3-way-merge Thanks for mentioning this. I realize the interaction between git and the po/ directory is a big issue. We plan to resolve this issue in a different way; a 3-way-merge for PO files will then be unnecessary. Bruno
[Prev in Thread] | Current Thread | [Next in Thread] |