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

Carpentry connect hackathon improvements #6

Open
wants to merge 132 commits into
base: main
Choose a base branch
from

Conversation

colinsauze
Copy link
Member

  • References and URLs for Github changed to Gitea
  • Brought in changes from the latest upstream Carpentries Git Novice lesson (includes changing from Dracula/Wolfman to a Guacamole recipe)
  • Switched to Pea Soup instead of Guacamole as the recipe for better understanding in countries where Guacamole isn't a common dish

Still to do:
Update screenshots
Test gitea workflows are correct, right now they are just copied from the Github one's and some things will be different.

KoenLeuveld and others added 30 commits June 5, 2023 14:57
Migrated old changes made to the styles lesson but as sandpaper
This includes the changes done to:
5c3f297
ca6d833
376bc11
Where it says nothing is lost unless you work hard at it, that could be read as the thing you worked hard on.  This clarifies that you have to work really hard to destructively lose all your changes
Update link broken from the transition to Carpentries workbench, and link to latest git lesson publication o Zenodo
Fix Windows CRLF configuration recommendation to auto.
Using ssh keys is now a requirement so this note is outdated.
In the target audience .csv is more widespread file extension than .dat. In
addition, the spoken “dot dat” has led to confusion in that past (when being
understood as “dot dot”).
add guidance for configuring 2FA on GitHub accounts
the PR was missing the last `git restore` needed to put `mars.txt` back in the state at the beginning of the episode (before the ill-considered change)
Include reference to git installation from chapter 2
…s-lost

clarify language losing your work
Revert "Include reference to git installation from chapter 2"
martinosorb and others added 29 commits September 29, 2024 18:50
Update overlooked references to "Vlad" 🙂
Clarify section on staging during restore
Co-authored-by: Martino Sorbaro <[email protected]>
Flesh out 'Key Point' in 'Ignoring Things'
Copy link

⚠️ WARNING ⚠️

This pull request contains a mix of workflow files and regular files. This could be malicious. No preview will be created.

regular files:

  • README.md
  • episodes/01-basics.md
  • episodes/02-setup.md
  • episodes/03-create.md
  • episodes/04-changes.md
  • episodes/05-history.md
  • episodes/06-ignore.md
  • episodes/07-github.md
  • episodes/08-collab.md
  • episodes/09-conflict.md
  • episodes/11-licensing.md
  • episodes/12-citation.md
  • episodes/13-hosting.md
  • episodes/14-supplemental-rstudio.md
  • episodes/fig/git-freshly-made-github-repo.svg
  • episodes/fig/git-restore.svg
  • episodes/fig/git_staging.svg
  • episodes/fig/github-add-collaborators.png
  • episodes/fig/github-collaboration.svg
  • episodes/fig/github-repo-after-first-push.svg

workflow files:

  • .github/workflows/README.md
  • .github/workflows/pr-close-signal.yaml
  • .github/workflows/pr-comment.yaml
  • .github/workflows/pr-post-remove-branch.yaml
  • .github/workflows/pr-preflight.yaml
  • .github/workflows/pr-receive.yaml
  • .github/workflows/sandpaper-main.yaml
  • .github/workflows/sandpaper-version.txt
  • .github/workflows/update-cache.yaml
  • .github/workflows/update-workflows.yaml

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.