https://github.com/chendaniely/2020-09-09-ccathome-git-dan
Carpentry Con at Home Git workshop Part 2
Science Score: 26.0%
This score indicates how likely this project is to be science-related based on various indicators:
-
○CITATION.cff file
-
✓codemeta.json file
Found codemeta.json file -
✓.zenodo.json file
Found .zenodo.json file -
○DOI references
-
○Academic publication links
-
○Committers with academic emails
-
○Institutional organization owner
-
○JOSS paper metadata
-
○Scientific vocabulary similarity
Low similarity (10.9%) to scientific vocabulary
Repository
Carpentry Con at Home Git workshop Part 2
Basic Info
- Host: GitHub
- Owner: chendaniely
- License: cc0-1.0
- Default Branch: master
- Size: 296 KB
Statistics
- Stars: 1
- Watchers: 3
- Forks: 0
- Open Issues: 0
- Releases: 0
Metadata Files
README.md
2020-09-09: CarpentryCon@Home git workshop
Etherpad: https://pad.carpentries.org/cchome-maintainer-git-skills
This was the second time I taught this workshop, the video for the first time can be found here: https://www.youtube.com/watch?v=uvWhSYBkZJ0
Carpentry Con at Home Git workshop Part 2
- git clone
: download the repo from the web to your computer - make sure you are not in another repo
- just like git init do only one per repo
Branches
git branch <branch_name>: create a new branch where you are (HEAD)git switch <branch_name>: moves you to<branch_name>git checkout <branch_name>: pre aug 2019 way to move to another branch
shortcuts for creating branches, will create and move to them in 1 go:
- `git checkout -b
- `git switch -c
- `git checkout -b
git branch -d <branch_name>: this will deleteon your local computer git fetch --prune: will update your local git tree with the remote- the prune will also delete references to branches that were deleted on the remote
Each pull request is independent from one another
- You won't know a merge conflict will happen until one of the PRs gets merged
git rebase <branch>: rebases your current branch against<branch>, where<branch>is usuallymasterorgh-pages- make sure you are already on the conflicting branch
Additional resources
Some additional notes and links
Software Carpentry notes on basic git: https://swcarpentry.github.io/git-novice/
- The setting up git has the commands to setup your name/email/editor: https://swcarpentry.github.io/git-novice/02-setup/index.html
Git workflow notes and commands (to paste on your wall)
- https://chendaniely.github.io/trainingdsr/help-faq.html
Atlassian page on git workflows: https://www.atlassian.com/git/tutorials/comparing-workflows
- The one we covered today was mainly the "Feature Branch Workflow": https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
The atlassian page has more infor about "git flow", but this is also another top Google hit that I liked:
- https://nvie.com/posts/a-successful-git-branching-model/
Getting your (bash) terminal to show current path and other things:
- Use this to create your PS1 variable: http://bashrcgenerator.com/
Show git branch in terminal:
- In addition you can write a function and put that in your PS1 to also show git branch
- https://gist.github.com/joseluisq/1e96c54fa4e1e5647940
https://chendaniely.github.io/trainingdsr/help-faq.html (has the checklist)
https://happygitwithr.com/ (more rstudio specific workflows)
https://swcarpentry.github.io/git-novice/
https://www.youtube.com/watch?v=uvWhSYBkZJ0
Setting up ssh links: https://bi-sdal.github.io/training/ssh-keys.html
Owner
- Name: Daniel Chen
- Login: chendaniely
- Kind: user
- Location: JFK -> DCA -> ROA -> JFK -> YVR
- Company: @rstudio @UBC-DSCI @UBC-MDS
- Website: http://chendaniely.github.io
- Twitter: chendaniely
- Repositories: 460
- Profile: https://github.com/chendaniely
bow ties are cool
GitHub Events
Total
Last Year
Committers
Last synced: about 1 year ago
Top Committers
| Name | Commits | |
|---|---|---|
| Daniel Chen | c****y@g****m | 11 |
Issues and Pull Requests
Last synced: about 1 year ago
All Time
- Total issues: 0
- Total pull requests: 4
- Average time to close issues: N/A
- Average time to close pull requests: 10 minutes
- Total issue authors: 0
- Total pull request authors: 1
- Average comments per issue: 0
- Average comments per pull request: 0.25
- Merged pull requests: 4
- Bot issues: 0
- Bot pull requests: 0
Past Year
- Issues: 0
- Pull requests: 0
- Average time to close issues: N/A
- Average time to close pull requests: N/A
- Issue authors: 0
- Pull request authors: 0
- Average comments per issue: 0
- Average comments per pull request: 0
- Merged pull requests: 0
- Bot issues: 0
- Bot pull requests: 0
Top Authors
Issue Authors
Pull Request Authors
- chendaniely (4)