BENSOUSSAN--BOHM DANIEL p1507430 <daniel.bensoussan--bohm@xxxxxxxxxxxxxxxxx> writes: >>The document starts with > > >This document attempts to write down and motivate some of the > >workflow elements used for `git.git` itself. Many ideas apply > >in general, though the full workflow is rarely required for > >smaller projects with fewer people involved. > >>and makes me wonder (note: I am not involved in writing any of the >>existing text in this document) how much material foreign to the >>actual workflow used for `git.git` should go in here. Having >>multiple maintainers at the same time is not a workflow element that >>we have ever used, for example, so I am not sure about the change in >>the above paragraph. > > We were told to change 'he' into 'they' to be neutral. However, it's true > that there's one maintainer at a time so we will remove the 's' from > "maintainers". Not a native speaker, but according to wikipedia (https://en.wikipedia.org/wiki/Singular_they) it's OK to write "maintainer [singular, but already neulral] may get merge conflicts when they [sinugular they] ..." -- Matthieu Moy https://matthieu-moy.fr/
