search

ns-rse / git-collaboration

Intermediate level course on using Git for collaboration
https://ns-rse.github.io/git-collaboration/
Other
1 stars 0 forks source link

Adding examples of merging and rebasing for divergent branches #51

Closed ns-rse closed 4 months ago

ns-rse commented 4 months ago

Closes #12 Closes #13 Closes #14 Closes #15

github-actions[bot] commented 4 months ago

Thank you!

Thank you for your pull request :smiley:

:robot: 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:

Rendered Changes

:mag: Inspect the changes: https://github.com/ns-rse/git-collaboration/compare/md-outputs..md-outputs-PR-51

The following changes were observed in the rendered markdown documents:

 branching.md | 856 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 md5sum.txt   |   2 +-
 2 files changed, 818 insertions(+), 40 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.

:stopwatch: Updated at 2024-03-01 23:03:00 +0000