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 [thread overview]
Message-ID: <7ce381c9-77c5-2ef2-e8c7-fba1b337bd4a@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
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.
next reply other threads:[~2020-12-10 17:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 17:08 Adolf Belka [this message]
2020-12-11 8:54 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ce381c9-77c5-2ef2-e8c7-fba1b337bd4a@gmail.com \
--to=ahb.ipfire@gmail.com \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox