Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

cansavvy
Copy link
Collaborator

@cansavvy cansavvy commented Jun 3, 2024

Summary

I want to see if between this fix and : jhudsl/ottr-reports#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 fhdsl/Intro_to_R#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.

Copy link
Contributor

github-actions bot commented Jun 3, 2024

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

Copy link
Contributor

github-actions bot commented Jun 3, 2024

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

@cansavvy
Copy link
Collaborator Author

cansavvy commented Jun 5, 2024

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

@cansavvy
Copy link
Collaborator Author

cansavvy commented Jun 5, 2024

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.

Copy link
Contributor

github-actions bot commented Jun 5, 2024

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 79447ca

@cansavvy cansavvy merged commit 9c19510 into main Jun 5, 2024
8 checks passed
@cansavvy cansavvy deleted the cansavvy/branch-conflicts branch June 5, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant