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

Use mermaid git graphs #51

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ weight = 40
disableBreadcrumb = false
disableNextPrev = false
themeVariant = "rse-learn"

disableMermaid = false
customMermaidURL = "https://unpkg.com/mermaid@9.1.7/dist/mermaid.min.js"


[markup]
18 changes: 17 additions & 1 deletion content/04-collaborative_github_advanced/00-intro.md
Original file line number Diff line number Diff line change
@@ -27,4 +27,20 @@ Branching is a core concept in Git. There's only one rule: **anything in the `ma



it's extremely important that your new branch is created off of main when working on a feature or a fix. Your branch name should be descriptive, so that others can see what is being worked on.
it's extremely important that your new branch is created off of main when working on a feature or a fix. Your branch name should be descriptive, so that others can see what is being worked on.


{{<mermaid>}}
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true,'showCommitLabel': false}} }%%
gitGraph
commit
commit
commit
commit
commit
branch feature
checkout feature
commit
commit
checkout main
{{</mermaid>}}
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@ module github.com/annakrystalli/rse-workshop-materials-template
go 1.14

require (
github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c // indirect
github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 // indirect
github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2 // indirect
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are these just sub-minor version changes?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It seems that way doesn't it, hugo modules are still a bit confusing to me.

github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d // indirect
)
12 changes: 4 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae h1:x2cMxkgkOshGVuUswcYK1Nda6s0QFff8QDOIt3eCfKA=
github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8=
github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c h1:MqLk4B4fKbRMECHQAMY0S5RFovEtjXS9TTMLsB/NWJU=
github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8=
github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c h1:wuILQJPvX0BYvxuvktvToxtOxAcELdnPS0ppKJ4f9Dw=
github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY=
github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 h1:Vxgl1/dyKpZDstVWmxNL9BauEGxLXrcbe1T09/dEzTY=
github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY=
github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2 h1:8HLH/Bt9+oK+/hu/HxPUlyMbo3WUUxrDkM2aw7IzBXg=
Copy link
Collaborator

Choose a reason for hiding this comment

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

WHat does this do, please?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Have now tidied this up, it's something to do with hugo modules.

github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8=
github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d h1:p7ktiW/GnHccjB9oO5YGY7us5v/oHmkyF0C7EDZFM3s=
github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY=