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 branching episode #58

Merged
merged 9 commits into from
Mar 5, 2024
Merged

Add branching episode #58

merged 9 commits into from
Mar 5, 2024

Conversation

avallecam
Copy link
Member

Fixes #25

Copy link

github-actions bot commented Mar 5, 2024

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/epiverse-trace/git-rstudio-basics/compare/md-outputs..md-outputs-PR-58

The following changes were observed in the rendered markdown documents:

 07-github.md                            |  17 +-
 08-collab.md                            |  37 ++--
 09-conflict.md                          | 290 ++++++++++++++++++++++----------
 14-supplemental-rstudio.md              |   8 -
 fig/github-branch-pullrequest.png (new) | Bin 0 -> 20685 bytes
 fig/github-commit-diff.png (new)        | Bin 0 -> 33412 bytes
 fig/github-commits-button.png (new)     | Bin 0 -> 110462 bytes
 md5sum.txt                              |  10 +-
 renv.lock                               |   4 +-
 9 files changed, 247 insertions(+), 119 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 2024-03-05 21:36:49 +0000

github-actions bot pushed a commit that referenced this pull request Mar 5, 2024
@avallecam avallecam marked this pull request as ready for review March 5, 2024 20:18
github-actions bot pushed a commit that referenced this pull request Mar 5, 2024
github-actions bot pushed a commit that referenced this pull request Mar 5, 2024
@avallecam avallecam merged commit 46b8d3b into main Mar 5, 2024
3 checks passed
@avallecam avallecam deleted the add-branching branch March 5, 2024 21:46
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.

add new episode on branching and merging
1 participant