Hi,

Git copes perfectly well with those changes.

Since the files are so long, it is quite unlikely that you are changing the file in the same place. Some add-ons use a little prefix like “ovpn” for their strings, so you literally won’t collide in the file.

The automatically generated files through “./make.sh lang” might conflict, but whoever merges them together simply can run the command again and they will be generated with the correct content.

So, please do not worry. A merge conflict isn’t a bad thing. Quite the opposite: I would like to see where those happen because we need to pay some extra attention there when we merge patches.

I hope this clears up things.

Best,
-Michael

> On 10 Dec 2020, at 18:08, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
> 
> Hi All,
> 
> I am working on another bug fix (10743) where I am adding the checkbox name and 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 Erik 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 same 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.
>