jhudsl / OTTR_Template

OTTR for making courses! This is a template repo that helps people write 1 course but publish it in three places
https://www.ottrproject.org/
Creative Commons Attribution 4.0 International
15 stars 12 forks source link

Fixing branch conflicts -- by addressing the folder issue that I think is causing it #757

Closed cansavvy closed 3 months ago

cansavvy commented 3 months ago

Summary

I want to see if between this fix and : https://github.com/jhudsl/ottr-reports/pull/36 the branch woes can be cured. If not we can use @avahoffman 's more aggressive solution of using rebase everywhere.

This is a carryover from https://github.com/fhdsl/Intro_to_R/pull/41

I'm noticing in https://github.com/fhdsl/Intro_to_R/actions/runs/9227621475 render-tocless is finishing first (which is unusual) and may be the culprit for the branch conflicts.

If my hypothesis is right this change should resolve it. The way to test this is to: 1) merge this branch 2) Go to Actions > Render All Output Courses and click Run Workflow and run workflow again.I'm noticing in https://github.com/fhdsl/Intro_to_R/actions/runs/9227621475 render-tocless is finishing first (which is unusual) and may be the culprit for the branch conflicts.

github-actions[bot] commented 3 months ago

No spelling errors! :tada: Comment updated at 2024-06-05-13:45:22 with changes from 79447cae8a363ce4d7af7d327d65d1fd94b5bfc5

github-actions[bot] commented 3 months ago

No broken url errors! :tada: Comment updated at 2024-06-05-13:45:23 with changes from 79447cae8a363ce4d7af7d327d65d1fd94b5bfc5

cansavvy commented 3 months ago

Nope this isn't working. #756 it is.

cansavvy commented 3 months ago

This should also still be kept so we don't accidentally try to refresh folders out of order. i.e. the no_toc folder is inside the docs folder so best to keep a consistent order so we don't get tangled.

github-actions[bot] commented 3 months ago

Re-rendered previews from the latest commit:

* note not all html features will be properly displayed in the "quick preview" but it will give you a rough idea.

Updated at 2024-06-05 with changes from the latest commit 79447cae8a363ce4d7af7d327d65d1fd94b5bfc5