Dear @JonathanGregory, such a clash is called a `conflict` in git lingo and indeed does occur. But it is also one of the most common problems in versioning and as such one of the core abilities and raison d'etre of git is to help with their resolution. So don't worry, this will be easy to address.
Cheers Klaus -- Reply to this email directly or view it on GitHub: https://urldefense.us/v3/__https://github.com/cf-convention/cf-conventions/issues/343*issuecomment-1010099749__;Iw!!G2kpM7uM-TzIFchu!hA5hDuCghUqHKq87ObIWy4siQqjYnDB2KJ_GhR1BTT2DxoZtJNlmp7tVQdXSLKoAg2Fvz7Gw6Oc$ You are receiving this because you are subscribed to this thread. Message ID: <cf-convention/cf-conventions/issues/343/[email protected]> This list forwards relevant notifications from Github. It is distinct from [email protected], although if you do nothing, a subscription to the UCAR list will result in a subscription to this list. To unsubscribe from this list only, send a message to [email protected].
