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

Branches #47

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Branches #47

wants to merge 2 commits into from

Conversation

svenvanderburg
Copy link
Collaborator

@svenvanderburg svenvanderburg commented Feb 3, 2025

Fixes #16 together with esciencecenter-digital-skills/digital-skills-slides#13 PLEASE REVIEW IN CONJUNCTION

Copy link

github-actions bot commented Feb 3, 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/collaborative-git-and-github-lesson/compare/md-outputs..md-outputs-PR-47

The following changes were observed in the rendered markdown documents:

 08-branches.md (new)                               | 35 ++++++++++++++++
 ...llab-centralized.md => 09-collab-centralized.md |  8 ++--
 ...llab-distributed.md => 10-collab-distributed.md |  0
 config.yaml                                        |  7 ++--
 md5sum.txt                                         |  9 ++--
 renv.lock                                          | 49 ++++++++++++++++++++--
 6 files changed, 95 insertions(+), 13 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-02-03 15:09:03 +0000

github-actions bot pushed a commit that referenced this pull request Feb 3, 2025
Have a look at
[these slides introducing branches](https://esciencecenter-digital-skills.github.io/digital-skills-slides/modules/git-lesson/branches).


Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would be good to explain here at least briefly git switch, git branch, git checkout (there are always people who ask about it). And add an exercise about it as in e.g. https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging??

@lyashevska
Copy link
Contributor

Great materials! Thanks a lot @svenvanderburg I left sime suggestions in comments. Maybe we could expand a little this topic and get an exercise or two?

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.

Introduce git branches
2 participants