Skip to content

Conditionals Concept Exercise Cleanup & Rename #2429

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 96 commits into from
Closed

Conditionals Concept Exercise Cleanup & Rename #2429

wants to merge 96 commits into from

Conversation

BethanyG
Copy link
Member

Renamed exercise to Meltdown Mitigation. Stub files reman as conditionals.py and conditionals_test.py.

  • Rewrote introduction.md
  • Rewrote instructions.md
  • Created hints.md
  • Created exemplar.py
  • Checked and edited conditionals_test.py
  • Added docstrings to conditionals.py
  • Added a /.meta/links.json file
  • Added meltdown-mitigation to track config.json
  • Formatted .meta/config.json file
  • Ran prettier

BethanyG added 15 commits May 14, 2021 15:54
@BethanyG
Rewrote/added instructions and introduction files.
7e8ea44
@BethanyG
Added config design, and exemplar files.
8815509
@BethanyG
Added stub file.
6d83e8a
@BethanyG
Added hints file.
4ec07fa
@BethanyG
Renamed exercise to mitigation meltdown.
d478dc8
@BethanyG
Renamed exercise folder to meltdown mitigation.
d460cae
@BethanyG
Added meltdown-mitigation exercise and ran prettier.
7b67ba0
@BethanyG
Rewrote/added instructions and introduction files.
2b30ff5
@BethanyG
Added config design, and exemplar files.
d6cf469
@BethanyG
Added stub file.
066345a
@BethanyG
Added hints file.
58d699c
@BethanyG
Renamed exercise to mitigation meltdown.
22839a0
@BethanyG
Renamed exercise folder to meltdown mitigation.
c8fe52f
@BethanyG
Added meltdown-mitigation exercise and ran prettier.
bdc0cb0
@BethanyG
Merge branch 'conditionals-cleanup' of https://github.com/BethanyG/py…
d770573 
…thon into conditionals-cleanup

Merged in changes from main that I forgot.
@BethanyG BethanyG requested a review from a team as a code owner May 15, 2021 00:00
BethanyG and others added 12 commits May 18, 2021 12:00
BethanyG added 18 commits May 29, 2021 17:43
@BethanyG
Rewrote/added instructions and introduction files.
c536c05
@BethanyG
Added config design, and exemplar files.
f5976c8
@BethanyG
Added stub file.
4771e91
@BethanyG
Added hints file.
e7e405c
@BethanyG
Renamed exercise to mitigation meltdown.
aef9db4
@BethanyG
Renamed exercise folder to meltdown mitigation.
1b60097
@BethanyG
Added meltdown-mitigation exercise and ran prettier.
38393a2
@BethanyG
Rewrote/added instructions and introduction files.
69a1fe2
@BethanyG
Added hints file.
733763d
@BethanyG
Added code example to hint for combining comparisons and booleans.
978126b
@BethanyG
Corrected reactor typo.
feb08aa
@BethanyG
Annotated test file with task markers and added trailing lines to stu…
85762b4 
…b and exmeplar files.
@BethanyG
removed results.json file and edited introduction to be in line with …
069a462 
…concep docs edits.
@BethanyG
Rewrote/added instructions and introduction files.
fb43ce2
@BethanyG
Added stub file.
0f5b77c
@BethanyG
Added hints file.
aa55dfb
@BethanyG
Renamed exercise folder to meltdown mitigation.
22d373c
@BethanyG
Merged PR changes manually, since auto-mergre couln't be done.
b297bb3
@BethanyG BethanyG requested a review from a team as a code owner May 30, 2021 01:29
@BethanyG BethanyG removed the request for review from a team May 30, 2021 01:31
@BethanyG
Copy link
Member Author

BethanyG commented May 30, 2021 •
edited
Loading

This is an evil merge-confilct resolution mess. Sincere apologies for it. Didn't know any other way of doing it, since the github instructions didn't work.

@BethanyG
Copy link
Member Author

BethanyG commented May 30, 2021 •
edited
Loading

@iHiD -- really not understanding what is going on here. Thought the code owners changes weren't supposed to trigger needing approval from admins?!!?

EDIT: I think this massive merge picked up the CODEOWNER changes. Ugh. Apologies.

@BethanyG BethanyG requested review from a team and neenjaw May 30, 2021 01:51
@BethanyG BethanyG mentioned this pull request May 30, 2021
Closed
@BethanyG BethanyG closed this May 30, 2021
@BethanyG BethanyG mentioned this pull request May 30, 2021
Merged
@ErikSchierboom ErikSchierboom added improve exercise 💖 improve test case 💖 improve test case(s) for an exercise labels Jun 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sachsom95 sachsom95 sachsom95 requested changes

@neenjaw neenjaw neenjaw approved these changes

Assignees
No one assigned
Labels
improve exercise 💖 improve test case 💖 improve test case(s) for an exercise
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@BethanyG @neenjaw @sachsom95 @ErikSchierboom @cmccandless @iHiD