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

Cdkharris/big merge #32

Open
wants to merge 124 commits into
base: gh-pages
Choose a base branch
from
Open

Cdkharris/big merge #32

wants to merge 124 commits into from

Conversation

cdkharris
Copy link
Member

This merge brings in several updates from the upstream repository for the lesson, including new sites and new lessons, one on environment variables and an overhaul of the parallel python lesson.

The lessons still need to be tested on Myriad and our site snippets need to be updated.

tkphd and others added 30 commits June 16, 2022 18:45
…or/revert-407-amdahl-code

Revert "Amdahl code"
…-incubator/revert-407-amdahl-code"

This reverts commit bdf8529, reversing
changes made to 86229eb.
There is an implication that `ls` can be used to read the file.
This disambiguates that implication.
Upon reviewing everyone's current job-with-name-status.snip, I realized that they all had "new_name" instead of "hello-world".
If "hello-world" is preferred, that would mean updating everyone's snip instead of the one line here.
…Corrections

Removes unneeded comma, redundant word, and changes to active voice
I had to move the structure of the paragraph around.
Only the first two lines had important changes.
@cdkharris cdkharris linked an issue May 29, 2024 that may be closed by this pull request
@dpshelio
Copy link
Member

Adding my comments here to for future records.
I think howe we've managed this fork over the last year will make our life a lot harder to keep sync with upstream. Since we have contributed our snippets upstream, I think our local deployment should only include changes in the config file and contribute upstream our improvements.
That way we could keep our fork easier to merge.
We can merge this now if needed and rebase the bits we need later on in a upstream-sync branch, but I'm afraid that doing so we may never come around to do it as it becomes harder and harder.

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.

Big Merge with the upstream SWC hpc-intro repo