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

Redo elyses-enchantments/lists.py as card-games #2405

Merged
merged 2 commits into from
May 12, 2021
Merged

Redo elyses-enchantments/lists.py as card-games #2405

merged 2 commits into from
May 12, 2021

Conversation

IsaacG
Copy link
Member

@IsaacG IsaacG commented Apr 23, 2021

Rewrite the lists concepts exercise

@BethanyG
Copy link
Member

Please see #2404, (which should be merged first or combined with this rename) for the associated introduction.md. The introduction.md file included here is outdated.

@BethanyG BethanyG requested a review from cmccandless April 27, 2021 15:47
@BethanyG
Copy link
Member

@cmccandless - tagging you because I extensively helped with the story on this, so I think it needs a different set of eyes. 😄

@BethanyG
Copy link
Member

@IsaacG -- if @cmccandless has no additional comments, I think this is good to go! 🎉 thank you for your work on it.

I am, however going to wait to merge-- because we've renamed the exercise from what it was originally, we'll probably need @iHiD help with syncing. And since there are at least three more exercises that need rewrite/rename, I think we'll want to do them in a batch to avoid problems.

@cmccandless
Copy link
Contributor

Approved

@iHiD
Copy link
Member

iHiD commented May 4, 2021

I am, however going to wait to merge-- because we've renamed the exercise from what it was originally, we'll probably need @iHiD help with syncing. And since there are at least three more exercises that need rewrite/rename, I think we'll want to do them in a batch to avoid problems.

If these are renamed concept exercises, it should be fine to merge. Things should automatically sync up. Thanks for checking though, and if it doesn't tell us so we can fix the bug :)

@BethanyG
Copy link
Member

Urg. @cmccandless - I think I need your git-foo here. Tried to resolve the merge conflicts manually at the CL, but (maybe because I have a fork??) I was unsuccessful.

@cmccandless
Copy link
Contributor

I'm going to try rebasing onto our main branch

@cmccandless
Copy link
Contributor

I'll make a bookmark branch just in case to preserve the work here as it is now

@cmccandless
Copy link
Contributor

CI looks good. Can @BethanyG and/or @IsaacG please inspect the rebased branch to ensure work has not been lost?

@BethanyG
Copy link
Member

I think we're good to go. @IsaacG ? Spot anything in need of correcting??

@IsaacG
Copy link
Member Author

IsaacG commented May 10, 2021

Looks about right to me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants