Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
R3
school
courses
Commits
16044a99
Verified
Commit
16044a99
authored
Mar 17, 2021
by
Laurent Heirendt
✈
Browse files
updated slides
parent
0b80f275
Changes
4
Hide whitespace changes
Inline
Side-by-side
2021/2021-03-18_basicGitTraining/slides/index.md
View file @
16044a99
# R3.school
#
Elixir-LU training (
R3.school
)
## March
30
th, 202
0
## March
18
th, 202
1
<div
style=
"top: 6em; left: 0%; position: absolute;"
>
<img
src=
"theme/img/lcsb_bg.png"
>
...
...
@@ -14,6 +14,7 @@
<h4>
Laurent Heirendt, Ph.D.
<br><br>
laurent.heirendt@uni.lu
<br><br>
<i>
Luxembourg Centre for Systems Biomedicine
</i>
<i>
ELIXIR/LU,
Luxembourg Centre for Systems Biomedicine
</i>
</h4>
</div>
2021/2021-03-18_basicGitTraining/slides/merge.md
View file @
16044a99
#
Merge (pull
) requests
#
Pull (merge
) requests
If you want your changes to be reflected on the
`develop`
or
`master`
branches,
**submit a
merge request (MR)
**
via the
g
it
-r3la
b interface.
**submit a
PR
**
via the
G
it
hu
b interface.
Use the
**interface**
to make use of your peers to review your code!
<img
src=
"slides/img/branch-merge.png"
class=
"branch-merge"
height=
"500em"
/>
...
...
2021/2021-03-18_basicGitTraining/slides/syncFork.md
View file @
16044a99
...
...
@@ -5,8 +5,7 @@
Add the
`upstream`
address (original/protected repository)
```
bash
$ URL
=
ssh://git@git-r3lab-server.uni.lu:8022/R3/school/git/basic-practice-pages.git
$
git remote add upstream
$URL
$
git remote add upstream git@github.com:LCSB-BioCore/basic-git-practice.git
```

Note the change in the URL.
...
...
2021/2021-03-18_basicGitTraining/slides/thanks.md
View file @
16044a99
...
...
@@ -24,9 +24,11 @@
# References & Cheat sheet
1.
Git Book: https://git-scm.com/book/en/v2
[
1
]:
Git
Book: https://git-scm.com/book/en/v2
2.
Cheat sheet: http://rogerdudler.github.io/git-guide
[
2
]:
GitHub
training services: https://services.github.com/training/
[
3
]:
Cheat
sheet: http://rogerdudler.github.io/git-guide
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment