search

ngs-docs / 2021-august-remote-computing

Remote computing workshops in August 2021
https://ngs-docs.github.io/2021-august-remote-computing
4 stars 2 forks source link

[WIP] Workshop 8 notes: version control with git #28

Closed s-canchi closed 3 years ago

s-canchi commented 3 years ago

Draft lesson on git and GitHub. This needs some updating based on discussion with Nick. Lesson planning docs: https://hackmd.io/cLZuRkaPQKu783AZDFPKbw?view

ctb commented 3 years ago

To make this mergable, I did:

git fetch
git checkout day8
git pull origin main
git checkout --ours docs/

after which there were, as expected, no merge problems ;)

ctb commented 3 years ago

did a quick spellcheck - found and fixed a few things, in fd91795. Merging now.