From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: Question about Language file updates
Date: Thu, 10 Dec 2020 18:08:20 +0100
Message-ID: <7ce381c9-77c5-2ef2-e8c7-fba1b337bd4a@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7451138318580144651=="
List-Id: <development.lists.ipfire.org>

--===============7451138318580144651==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi All,

I am working on another bug fix (10743) where I am adding the checkbox name a=
nd an error message into the Language files.

My question is can git cope if two patches are submitted by different people =
both working on the language files. The reason I ask this is because I know E=
rik Kapfer is working on the language files for the OpenVPN update.

If git can't cope with two submissions for the same files changing at the sam=
e time then how do I tell when the files are no longer being changed so that =
I can submit my patch without creating a conflict problem.


Regards,

Adolf.


--===============7451138318580144651==--