From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: Question about Language file updates Date: Fri, 11 Dec 2020 09:54:13 +0100 Message-ID: <53B4CCA2-A817-4576-9BF5-694DFB77D710@ipfire.org> In-Reply-To: <7ce381c9-77c5-2ef2-e8c7-fba1b337bd4a@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3323794941099959193==" List-Id: --===============3323794941099959193== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, Git copes perfectly well with those changes. Since the files are so long, it is quite unlikely that you are changing the f= ile in the same place. Some add-ons use a little prefix like =E2=80=9Covpn=E2= =80=9D for their strings, so you literally won=E2=80=99t collide in the file. The automatically generated files through =E2=80=9C./make.sh lang=E2=80=9D mi= ght conflict, but whoever merges them together simply can run the command aga= in and they will be generated with the correct content. So, please do not worry. A merge conflict isn=E2=80=99t a bad thing. Quite th= e opposite: I would like to see where those happen because we need to pay som= e extra attention there when we merge patches. I hope this clears up things. Best, -Michael > On 10 Dec 2020, at 18:08, Adolf Belka wrote: >=20 > Hi All, >=20 > I am working on another bug fix (10743) where I am adding the checkbox name= and an error message into the Language files. >=20 > My question is can git cope if two patches are submitted by different peopl= e both working on the language files. The reason I ask this is because I know= Erik Kapfer is working on the language files for the OpenVPN update. >=20 > If git can't cope with two submissions for the same files changing at the s= ame time then how do I tell when the files are no longer being changed so tha= t I can submit my patch without creating a conflict problem. >=20 >=20 > Regards, >=20 > Adolf. >=20 --===============3323794941099959193==--