Skip to content

Expand on version control section - #22

Open
jackdfranklin wants to merge 10 commits into
bas-training-2026from
18-expand-on-version-control-section
Open

jackdfranklin wants to merge 10 commits into
bas-training-2026from
18-expand-on-version-control-section

Conversation

@jackdfranklin

@jackdfranklin jackdfranklin commented Oct 27, 2026 •

Copy link
Copy Markdown
Collaborator

Resolves #18 by adding more detailed content on git workflow for the BAS reproducibility training.

Task list:

  • Add/Commit workflow
  • Mention Atomic commits
  • Add Branches slides

Description

As this course will be delivered standalone, rather than at the end of the Summer School, we need to expand on the details on version control and git in particular.

To achieve this I have added the ICCS intro to git summer school course as a submodule and used the slides from there to avoid having to remake them myself. This also involved moving changing the image directory name from img to images to match the git course (hence the large number of changed files, which are mostly just from a git mv). I also updated the custom.scss file to match the git course, and added the attribution extension for compatibility.

@jackdfranklin jackdfranklin linked an issue Oct 27, 2026 that may be closed by this pull request
@jackdfranklin
jackdfranklin changed the base branch from main to bas-training-2026 October 27, 2026 11:53
@jackdfranklin
jackdfranklin marked this pull request as ready for review October 29, 2026 11:52
@jackdfranklin jackdfranklin self-assigned this Oct 29, 2026
@MarionBWeinzierl

MarionBWeinzierl commented Oct 30, 2026 •

Copy link
Copy Markdown
Member

@jackdfranklin could you please add a PR description detailing what you are actually doing here?

This might help you: https://github.com/Cambridge-ICCS/handbook/blob/main/software-engineering/pull-request-template.md

@jackdfranklin

Copy link
Copy Markdown
Collaborator Author

@MarionBWeinzierl I've updated the top comment to describe this PR in a bit more detail. Hopefully it's a bit clearer now?

@MarionBWeinzierl MarionBWeinzierl left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks overall good, but do we need the flakes.nix file in here?

Comment thread flake.nix

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is it intentional to have OS-specific files in the repo?

This branch has not been deployed

No deployments
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.

Expand on version control section

2 participants