Re: [PATCH] docs: pt_BR: Reorganize index.rst to avoid merge conflicts

Daniel Pereira <[email protected]> writes:

> The main index.rst file for the pt_BR translation was grouping all
> translated documents directly in its toctree. Because many contributors
> are submitting translations simultaneously to the same file, it has
> become a bottleneck, causing frequent merge conflicts.
>
> To solve this issue and improve maintainability, this patch refactors
> the structure to follow the pattern used by the base English
> documentation. Specifically, a new index.rst was created inside the
> process/ directory to handle all future contributions and document
> additions targeting that specific directory.
>
> The root index.rst now simply references process/index.rst. This
> modular organization keeps the main tree clean and significantly
> reduces patch collisions.
>
> Signed-off-by: Daniel Pereira <[email protected]>
> ---
>  Documentation/translations/pt_BR/index.rst    | 28 +--------------
>  .../translations/pt_BR/process/index.rst      | 34 +++++++++++++++++++
>  2 files changed, 35 insertions(+), 27 deletions(-)
>  create mode 100644 Documentation/translations/pt_BR/process/index.rst

This is a step in the right direction but...  having everybody just
append TOC entries to a different file will not change the overall
situation.  It would be far better to translate
Documentation/process/index.rst, with its subsection structure, to avoid
that "everybody appends and conflicts" behavior.

This patch, of course, also conflicts badly with the various other
translations that you have acked.

Here is my suggestion: I'll apply the outstanding Portuguese translation
patches today, then say "no more" for 7.3.  You can then create a new
index.rst that is current with all of the done translations; we can
apply that either before or after the merge window.  Everybody doing
translation patches can then work against that new index.rst file and,
hopefully, life will get smoother.

Does that work for you?

Thanks,

jon