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

Drafting new GitHub workshop #194

Merged
merged 42 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
723f018
Add .venv to .gitignore
vinisalazar Aug 5, 2024
78890b7
Remove mdx_showable extension
vinisalazar Aug 5, 2024
9de05c6
Drafting new tutorial
vinisalazar Aug 6, 2024
a06c1c2
Add overview and setup sections to GitHub workshop
vinisalazar Aug 7, 2024
ffc8c86
Working on introduction
vinisalazar Aug 7, 2024
2b17731
Progressing on new Git workshop
vinisalazar Sep 6, 2024
f780e5f
Add VS Code code-workspace files to .gitignore
vinisalazar Sep 6, 2024
ea30698
Finish 'What is Git' section
vinisalazar Sep 6, 2024
07279c2
Update navbar of index page
vinisalazar Sep 6, 2024
8ef0553
Fix typo in title
vinisalazar Sep 6, 2024
71a9ca0
Add missing figure
vinisalazar Sep 6, 2024
c377249
Finishing touches to first sectionj
vinisalazar Sep 6, 2024
d07611e
Finish section 'Why use version control?'
vinisalazar Sep 6, 2024
4b55071
Finish section 'Fundamental concepts'
vinisalazar Sep 6, 2024
f3b2168
Add draft of workshop page template
vinisalazar Sep 6, 2024
246d1a2
Add session dividers
vinisalazar Sep 6, 2024
8190804
Add deprecation warning
vinisalazar Sep 9, 2024
48d50f2
Add code block features to mkdocs.yml
vinisalazar Sep 9, 2024
a84e628
Add admonition specifications to template
vinisalazar Sep 9, 2024
40f64e7
Add section 'Your first Git repository'
vinisalazar Sep 9, 2024
59f836e
Turn on code annotations with mkdocs
vinisalazar Sep 9, 2024
f9b7a51
Draft 'Tracking Changes' section
vinisalazar Sep 9, 2024
0e4d203
Merge branch 'master' into dev
vinisalazar Sep 9, 2024
dc8a2a4
Merge branch 'master' into dev
vinisalazar Sep 9, 2024
8d5546c
Add WIP warning
vinisalazar Sep 9, 2024
e36850d
Merge branch 'master' into dev
vinisalazar Sep 9, 2024
de21b10
Draft section 'Remotes: pushing and pulling'
vinisalazar Sep 9, 2024
3f4f360
Update mkdocs.yml
vinisalazar Sep 10, 2024
60b421c
Draft 'Cloning' and 'Undoing' sections
vinisalazar Sep 10, 2024
a831b9e
Rename 'git_new' to 'git'
vinisalazar Sep 12, 2024
3a5f7d6
Update git link in navbar
vinisalazar Sep 12, 2024
4c03a77
Update links
vinisalazar Sep 16, 2024
389d59c
Move content of README.md to commented section in index.md
vinisalazar Sep 16, 2024
47fb5cf
Update link
vinisalazar Sep 16, 2024
691195c
Fix all warnings
vinisalazar Sep 16, 2024
f2270fc
Deprecate link
vinisalazar Sep 16, 2024
f3e7f9c
Remove link
vinisalazar Sep 16, 2024
8cb8880
Drafting 'Pull requests' section
vinisalazar Sep 16, 2024
82e3939
Drafting 'Merge conflicts' section
vinisalazar Sep 16, 2024
246b8ad
Drafting 'Tips and Best practices' section
vinisalazar Sep 16, 2024
b989fe0
Testing check fail
vinisalazar Sep 16, 2024
672ea67
Fix link back
vinisalazar Sep 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ mkdocs/
mkdocs_dev/
venv
.venv
*.code-workspace
13 changes: 5 additions & 8 deletions docs/guides/bioinfo.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@ Bioinformatics is the analysis of biologial data using computational methods. It
- Melbourne Bioinformatics tutorials: see the left hand panel for tutorials covering computing, genomics, RNA-seq, and proteomics.

- Australian Bioinformatics and Computational Biology Society:
[www.abacbs.org](www.abacbs.org)
[www.abacbs.org](http://www.abacbs.org)

- Student group of ABACBS - COMBINE: [www.combine.org.au]( www.combine.org.au)
- Student group of ABACBS - COMBINE: [www.combine.org.au](http://www.combine.org.au)

- Winter School in Mathematical and Computational Biology:
[www.bioinformatics.org.au](www.bioinformatics.org.au)
- BioInfo Summer: [www.bis.amsi.org.au](http://www.bis.amsi.org.au)

- BioInfo Summer: [www.bis.amsi.org.au](www.bis.amsi.org.au)
- Software Carpentry: [www.software-carpentry.org](http://www.software-carpentry.org)

- Software Carpentry: [www.software-carpentry.org](www.software-carpentry.org)

- Bioinformatics problem solving challenges: [www.rosalind.info](www.rosalind.info)
- Bioinformatics problem solving challenges: [www.rosalind.info](http://www.rosalind.info)

- A selelection of key journal papers published recently in [BMC Bioinformatics](http://blogs.biomedcentral.com/bmcseriesblog/2018/01/24/a-year-in-bioinformatics/).
1,080 changes: 1,080 additions & 0 deletions docs/tutorials/git/git.md

Large diffs are not rendered by default.

Binary file added docs/tutorials/git/media/PR_base_repository.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_conflict_commit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_conflict_editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_creation_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_files_changed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_review_changes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_review_merge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/PR_screen_conflict.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/add_new_section.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/clone_repo_cli.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/clone_repo_gh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/create_repo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/edit_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/file_after_editing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/fork_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/fork_commit_ahead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/fork_loading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/fork_page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/forked_repository.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions docs/tutorials/git/media/git-staging-area.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/git_log_break_code.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/tutorials/git/media/git_pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
122 changes: 122 additions & 0 deletions docs/tutorials/git/media/merge.svg
Binary file added docs/tutorials/git/media/phd101212s.png
Loading