docs: split out avoiding conflicts section

[nijel]

Proposed changes

Split into three sub-sections for better clarity and giving more focus on areas where to address these.

Checklist

• Lint and unit tests pass locally with my changes.
• I have added tests that prove my fix is effective or that my feature works.
• I have added documentation to describe my feature.
• I have squashed my commits into logic units.
• I have described the changes in the commit messages.

Other information

[nijel]

Rendered docs: https://weblate--13167.org.readthedocs.build/en/13167/admin/continuous.html#avoid-merge-conflicts