Skip to content

Switch code review PR target to be develop branch rather than main #464

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

bielsnohr
Copy link
Collaborator

@bielsnohr bielsnohr commented May 30, 2025

In the "Raising a Pull Request" section of Episode 4.1, the target branch for the PR is set to be main. If we are following "gitflow" like in the rest of the lesson, this should be develop. This has directly caused confusion in our runs of the course and I don't think it should cause any issues, although there might be some merge conflicts because the develop branch has had quite a bit done to it by this point, and the feature-std-dev branch is quite far behind.

I will report back how it goes, but if someone is able to resolve this more immediately, that would be appreciated.

Resolves #458

@bielsnohr bielsnohr self-assigned this May 30, 2025
@bielsnohr bielsnohr requested a review from anenadic May 30, 2025 16:08
Copy link

github-actions bot commented May 30, 2025

Thank you!

Thank you for your pull request 😃

🤖 This automated message can help you check the rendered files in your submission for clarity. If you have any questions, please feel free to open an issue in {sandpaper}.

If you have files that automatically render output (e.g. R Markdown), then you should check for the following:

  • 🎯 correct output
  • 🖼️ correct figures
  • ❓ new warnings
  • ‼️ new errors

Rendered Changes

🔍 Inspect the changes: https://github.com/carpentries-incubator/python-intermediate-development/compare/md-outputs..md-outputs-PR-464

The following changes were observed in the rendered markdown documents:

 41-code-review.md | 2 +-
 md5sum.txt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
What does this mean?

If you have source files that require output and figures to be generated (e.g. R Markdown), then it is important to make sure the generated figures and output are reproducible.

This output provides a way for you to inspect the output in a diff-friendly manner so that it's easy to see the changes that occur due to new software versions or randomisation.

⏱️ Updated at 2025-05-30 16:09:29 +0000

github-actions bot pushed a commit that referenced this pull request May 30, 2025
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.

Fix discrepancy in git instructions between section 3 and 4 in slides and course material
1 participant