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 -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/leo-editor/30a8b8da-0ae4-436c-a34a-6a0a39b3b1a7n%40googlegroups.com.
