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 collaborative git #2

Merged
merged 5 commits into from
Mar 28, 2024
Merged

Add collaborative git #2

merged 5 commits into from
Mar 28, 2024

Conversation

lyashevska
Copy link
Contributor

@lyashevska lyashevska commented Mar 27, 2024

About

This PR moves Collaborative Version Control episode into git-lesson

Changes

  • Added a markdown file with teaching content.
  • Added 03-collaborative-git.md to config.yaml

Review instructions

Requirements

See carpentries workbench requirements

Instructions

Follow steps outlined in the file.

Related issues

Copy link

github-actions bot commented Mar 27, 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/esciencecenter-digital-skills/git-lesson/compare/md-outputs..md-outputs-PR-2

The following changes were observed in the rendered markdown documents:

 03-collaborative-git-centralized.md (new) | 63 +++++++++++++++++++++++++++++++
 03-collaborative-git-distributed.md (new) | 58 ++++++++++++++++++++++++++++
 config.yaml                               |  2 +
 md5sum.txt                                |  4 +-
 4 files changed, 126 insertions(+), 1 deletion(-)
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-28 11:11:38 +0000

github-actions bot pushed a commit that referenced this pull request Mar 27, 2024
github-actions bot pushed a commit that referenced this pull request Mar 27, 2024
@lyashevska lyashevska marked this pull request as ready for review March 27, 2024 15:35
github-actions bot pushed a commit that referenced this pull request Mar 27, 2024
Copy link
Collaborator

@svenvanderburg svenvanderburg left a comment

Choose a reason for hiding this comment

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

Looks good! I left a few comments. At this point it is not really useful as standalone material, but I don't think that is the aim here.

I would suggest to split this into 2 episodes: one on centralized workflow and one on distributed workflow. So they match a bit more in terms of length and cognitive load the 7 episodes in the SWC git intro part.

Feel free to do with my feedback what you want and then merge!

episodes/03-collaborative-git.md Outdated Show resolved Hide resolved
episodes/03-collaborative-git.md Outdated Show resolved Hide resolved
@lyashevska
Copy link
Contributor Author

Great, thanks for your feedback. I guess the solution part should be left empty.

github-actions bot pushed a commit that referenced this pull request Mar 28, 2024
@lyashevska lyashevska merged commit 4cb1e9f into main Mar 28, 2024
3 checks passed
@lyashevska lyashevska deleted the 37-move-collab-git-to-workbench branch March 28, 2024 11:13
github-actions bot pushed a commit that referenced this pull request Mar 28, 2024
Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request Mar 28, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
@lyashevska
Copy link
Contributor Author

github-actions bot pushed a commit that referenced this pull request Apr 2, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request Apr 9, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request Apr 16, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request Apr 23, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request Apr 30, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request May 7, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
github-actions bot pushed a commit that referenced this pull request May 14, 2024
Auto-generated via {sandpaper}
Source  : 2ea5fbc
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-03-28 11:14:04 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 4cb1e9f
Branch  : main
Author  : Olga Lyashevska <olga.lyashevska@gmail.com>
Time    : 2024-03-28 11:13:11 +0000
Message : Merge pull request #2 from esciencecenter-digital-skills/37-move-collab-git-to-workbench

Add collaborative git
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.

Move Collaboration with git to the new workbench lesson
2 participants