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

Add instruction to merge test-suite branch in ep. 2.3 #383

Closed

Conversation

sjvrijn
Copy link
Contributor

@sjvrijn sjvrijn commented Oct 1, 2024

Related to #365

This PR is based on the comment by @douglowe:

It looks to me like the test-suite branch isn't merged into develop at the end of the Continuous Integration for Automated Testing episode. Perhaps the intention was to have the test-suite branch merged into develop at the end of this lesson instead?

@steve-crouch
Copy link
Collaborator

Also related to #376, which appears to have a different solution to the same issue if I understand it correctly. After discussing it with Aleks, we'll need to work out the best way forward after the material has transitioned to the new format which has become a priority. We'll recreate the PR after that. At least we're not short on solutions for this :)

@bielsnohr
Copy link
Collaborator

Okay, pulling all the threads together. First, see my comment on issue #365 . Critically, we do have a section in the lesson material that does merge the test-suite branch into develop, but it is buried at the bottom of Episode 2.4. Please leave your feedback on that comment because I am going to close this PR. My justification for closing without merging is that we already have a section on merging test-suite and because the pylint-ci mix-up will be handled in the other PR #376 . Thanks for the contribution regardless!

@bielsnohr bielsnohr closed this Oct 21, 2024
@sjvrijn sjvrijn deleted the 365a-merge-test-suite branch October 21, 2024 20:08
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.

3 participants