Skip to content

Commit 605456d

Browse files
Fresh compiled and converted after underscore corrections and git to Git corrections in yaml headers.
1 parent 1ab1345 commit 605456d

File tree

4 files changed

+223
-132
lines changed

4 files changed

+223
-132
lines changed

units/git-concept-basic/git-concept-basic.html

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.
Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,62 @@
11
---
2-
# Slide-related yaml
2+
# from style yaml - begin
33
marp: true
44
theme: dataplant_marp-theme
55
paginate: true
66
headingDivider:
77
- 1
88
- 2
9-
footer: '<a href="https://nfdi4plants.org"> <img id="footer-img1" src="../../images/DataPLANT_logo_square_bg_transparent.svg"> </a> <a href="https://ceplas.eu"><img id="footer-img2" src="../../images/CEPLAS_Icon.jpeg"></a><a href="https://creativecommons.org/licenses/by/4.0/"><img id="footer-img3" src="../../images/cc-by.svg"></a>'
10-
style: 'footer {height: 30px; padding: 10px; bottom: 00px;} #footer-img1 {height: 30px; padding-left: 0px;} #footer-img2 {height: 30px; padding-left: 20px; opacity: 0.5;} #footer-img3 {height: 20px;padding-left: 20px;opacity: 0.5;}'
11-
# Training yaml
12-
layout: slides
13-
title: "git intro basic"
14-
license: "[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)"
15-
duration_minutes: 5
16-
date: 2023-03-16
17-
status: draft
9+
footer: '
10+
<a href="https://nfdi4plants.org">
11+
<img id="footer-img1" src="../../images/_logos/DataPLANT/DataPLANT_logo_square_bg_transparent.svg">
12+
</a>
13+
<a href="https://ceplas.eu">
14+
<img id="footer-img2" src="../../images/_logos/CEPLAS/CEPLAS_Icon.jpeg">
15+
</a>
16+
<a href="https://creativecommons.org/licenses/by/4.0/">
17+
<img id="footer-img3" src="../../images/_logos/CreativeCommons/cc-by.svg">
18+
</a>'
19+
style: |
20+
footer {
21+
height: 30px;
22+
padding: 10px;
23+
bottom: 00px;
24+
}
25+
#footer-img1 {
26+
height: 30px;
27+
padding-left: 0px;
28+
}
29+
#footer-img2 {
30+
height: 30px;
31+
padding-left: 20px;
32+
opacity: 0.5;
33+
}
34+
#footer-img3 {
35+
height: 20px;
36+
padding-left: 20px;
37+
opacity: 0.5;
38+
}
39+
# from style yaml - end
40+
author: ['Dominik Brilhaus']
41+
author_orcid: ['https://orcid.org/0000-0001-9021-3197']
42+
author_github: ['brilator']
43+
license: ['[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)']
44+
title: ['Git concept basic']
45+
duration_minutes: ['5']
46+
date: ['2023-03-16']
47+
teaching_mode: ['inhale-listen']
48+
status: ['ready']
49+
headingDivider: ['1']
50+
learning_outcomes: ['version control', 'concept of Git']
1851
---
52+
<!-- headingDivider: 1 -->
1953

2054
# Git Basic Concept
2155

56+
2257
<!-- ################# -->
23-
<!-- Source to slide(s) -->
24-
<!-- ../../bricks/title-git-concept-basic.md -->
58+
<!-- Source to slide(s) above -->
59+
<!-- bricks/title-Git-concept-basic.md -->
2560
<!-- ################# -->
2661

2762

@@ -37,15 +72,16 @@ status: draft
3772
<span style="color:#c21f3a">X Data analytical projects</span>
3873
<span style="color:#c21f3a">X Big (“raw”) data</span>
3974

75+
4076
<!-- ################# -->
41-
<!-- Source to slide(s) -->
42-
<!-- ../../bricks/cloud-services.md -->
77+
<!-- Source to slide(s) above -->
78+
<!-- bricks/cloud-services.md -->
4379
<!-- ################# -->
4480

4581

46-
# Git and git platforms
82+
# Git and Git platforms
4783

48-
![bg right:50% w:800](../../images/DataSharing_git_img1.png)
84+
![bg right:50% w:800](../../images/DataSharing_Git_img1.png)
4985

5086
<span style="color:#F9CD69">∼ Documents</span>
5187
<span style="color:#B4CE82">✓ Small data</span>
@@ -56,22 +92,24 @@ status: draft
5692
<span style="color:#F9CD69">∼ Big (“raw”) data</span>
5793

5894

95+
5996
<!-- ################# -->
60-
<!-- Source to slide(s) -->
61-
<!-- ../../bricks/git-and-git-platforms.md -->
97+
<!-- Source to slide(s) above -->
98+
<!-- bricks/Git-and-Git-platforms.md -->
6299
<!-- ################# -->
63100

64101

65-
# Why git? ≈> Why code?
102+
# Why Git? ≈> Why code?
66103

67104
- Save time
68105
- Avoid doing repetitive tasks “by hand”
69106
- Reuse scripts, analyses, pipelines
70107
- Reproduce results
71108

109+
72110
<!-- ################# -->
73-
<!-- Source to slide(s) -->
74-
<!-- ../../bricks/git-why.md -->
111+
<!-- Source to slide(s) above -->
112+
<!-- bricks/Git-why.md -->
75113
<!-- ################# -->
76114

77115

@@ -86,9 +124,10 @@ status: draft
86124
- **Why** was it changed?
87125

88126

127+
89128
<!-- ################# -->
90-
<!-- Source to slide(s) -->
91-
<!-- ../../bricks/git-summary.md -->
129+
<!-- Source to slide(s) above -->
130+
<!-- bricks/Git-summary.md -->
92131
<!-- ################# -->
93132

94133

@@ -102,9 +141,10 @@ status: draft
102141
- Time machine to go back to older versions
103142

104143

144+
105145
<!-- ################# -->
106-
<!-- Source to slide(s) -->
107-
<!-- ../../bricks/GitHub-GitLab.md -->
146+
<!-- Source to slide(s) above -->
147+
<!-- bricks/GitHub-GitLab.md -->
108148
<!-- ################# -->
109149

110150

@@ -117,18 +157,20 @@ Simplifies concurrent work & merging changes
117157
- They can upload their changes and merge them with the main project
118158

119159

160+
120161
<!-- ################# -->
121-
<!-- Source to slide(s) -->
122-
<!-- ../../bricks/team-projects.md -->
162+
<!-- Source to slide(s) above -->
163+
<!-- bricks/team-projects.md -->
123164
<!-- ################# -->
124165

125166

126167
# Cloud vs. Git
127168

128-
![w:1000](../../images/git_cloud_comparison.png)
169+
![w:1000](../../images/Git_cloud_comparison.png)
170+
129171

130172
<!-- ################# -->
131-
<!-- Source to slide(s) -->
132-
<!-- ../../bricks/cloud-vs-git.md -->
173+
<!-- Source to slide(s) above -->
174+
<!-- bricks/cloud-vs-Git.md -->
133175
<!-- ################# -->
134176

0 commit comments

Comments
 (0)