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

resistor-color-duo: Update exercise to 2.1.0 #993

Merged
merged 2 commits into from
Aug 17, 2019

Conversation

pgaspar
Copy link
Member

@pgaspar pgaspar commented Aug 17, 2019

Problem specifications PR for 2.1.0: exercism/problem-specifications#1569

Mentor notes have already been merged here: exercism/website-copy#1231

@pgaspar pgaspar requested a review from emcoding August 17, 2019 19:58
@pgaspar pgaspar self-assigned this Aug 17, 2019
@emcoding
Copy link
Contributor

Thanks so much @pgaspar ! The thing is, we need the description from the track anatomy branch, and the tests from master. So, ta branch needs a rebase on master.
As it's only a few lines of text, I'm going to do the low tech solution and copy the relevant lines. YOLO

Copy link
Contributor

@emcoding emcoding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome to have this! Thanks.

As the TA branch and master have diverged, this regen brings in the master description. I copied in the text we need, but couldn't easily delete the text we don't need anymore.
I'll try to find a solution to avoid this kind of complications from now on.

exercises/resistor-color-duo/README.md Outdated Show resolved Hide resolved
Copy link
Contributor

@emcoding emcoding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

@pgaspar
Copy link
Member Author

pgaspar commented Aug 17, 2019

As the TA branch and master have diverged, this regen brings in the master description. I copied in the text we need, but couldn't easily delete the text we don't need anymore.
I'll try to find a solution to avoid this kind of complications from now on.

Yes, having two long lived branches (master and trackanatomy) can complicate things a bit...

@pgaspar pgaspar merged commit 3338656 into master Aug 17, 2019
@pgaspar pgaspar deleted the resistor-color-duo-updates branch August 17, 2019 21:59
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.

2 participants