I now make all changes to LeoDocs.leo in the gh-pages branch.
Later, I'll merge those changes back into devel.
This workflow is obvious in retrospect:
- The make-sphinx button in LeoDocs.leo must be run in the gh-pages branch.
- Making all changes in a single branch eliminates git merge conflicts.
Changing my workflow has no direct on any Leo dev. However, I recommend it for all.
Edward