diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/advanced.md b/2022/2022-06-14_git-trilogy-part-3/slides/advanced.md index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fa500e62d344a4e10ee0c62c5dcad5a4b72796e6 100644 --- a/2022/2022-06-14_git-trilogy-part-3/slides/advanced.md +++ b/2022/2022-06-14_git-trilogy-part-3/slides/advanced.md @@ -0,0 +1,11 @@ +# Rebase + + + +# Cherry-pick + + + + + +# Conflict resolution \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/Git-Logo-Black.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/Git-Logo-Black.png new file mode 120000 index 0000000000000000000000000000000000000000..ff4b320fd88283e740b454053124381c3b44e6b6 --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/Git-Logo-Black.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/Git-Logo-Black.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/bulb.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/bulb.png new file mode 120000 index 0000000000000000000000000000000000000000..448f93636d73773c55e586ebc92ad01e321270c5 --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/bulb.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/bulb.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/git_definition.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/git_definition.png new file mode 120000 index 0000000000000000000000000000000000000000..9466b6feed2b756a17595932641047eaaef1cee9 --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/git_definition.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/git_definition.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/github_app.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/github_app.png new file mode 120000 index 0000000000000000000000000000000000000000..54cc284bae737f18b7bcb588927712ad7467d24e --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/github_app.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/github_app.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/icon-live-demo.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/icon-live-demo.png new file mode 120000 index 0000000000000000000000000000000000000000..ffbc30695d9b150f490f333033c7a4df5a93c9f7 --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/icon-live-demo.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/icon-live-demo.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png deleted file mode 100644 index 48a3aeaa54640a2bde1d4534dd9922d2ea90840c..0000000000000000000000000000000000000000 Binary files a/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png and /dev/null differ diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png b/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png new file mode 120000 index 0000000000000000000000000000000000000000..0224ca999aa409c45016c9f2ba166151fb572f8a --- /dev/null +++ b/2022/2022-06-14_git-trilogy-part-3/slides/img/r3-training-logo.png @@ -0,0 +1 @@ +../../../../2020/2020-03-30_basicGitTraining/slides/img/r3-training-logo.png \ No newline at end of file diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/list.json b/2022/2022-06-14_git-trilogy-part-3/slides/list.json index 8ba3861fef261fa7aded7c42db0bca434254c2c4..0789b7714fc2c2255c57bacf32e4a6ee3165c5e6 100644 --- a/2022/2022-06-14_git-trilogy-part-3/slides/list.json +++ b/2022/2022-06-14_git-trilogy-part-3/slides/list.json @@ -1,5 +1,6 @@ [ { "filename": "index.md" }, + { "filename": "overview.md" }, { "filename": "installation.md" }, { "filename": "the_terminal.md" }, { "filename": "configuration.md" }, diff --git a/2022/2022-06-14_git-trilogy-part-3/slides/thanks.md b/2022/2022-06-14_git-trilogy-part-3/slides/thanks.md index e697983e5d5dcb959c3a127417fb6dcf1a18d78c..672ad3de9cc63ecebb6cde6228376db4193f1c96 100644 --- a/2022/2022-06-14_git-trilogy-part-3/slides/thanks.md +++ b/2022/2022-06-14_git-trilogy-part-3/slides/thanks.md @@ -2,23 +2,19 @@ <div class="fragment"> -- What is a **fork**? +- What are the **5 essential commands**? <div class="fragment"> -- What are **branches**? +- How can I update my fork locally? <div class="fragment"> -- Can I have **multiple branches** in my fork? +- What can I do to include the work from somebody else in my own work? <div class="fragment"> -- What is a good **development scheme**? - -<div class="fragment"> - -- What are the **5 essential commands**? +- What if things go wrong? @@ -36,16 +32,11 @@ <br> <center> -<img src="slides/img/elixir.png" height="200px"> <img src="slides/img/r3-training-logo.png" height="200px"> <br><br> Contact us if you need help: <br><br> -lcsb-r3@uni.lu -<br><br> -We'd appreciate feedback: https://bit.ly/elixirgit202110 -<br><br> -Next course: `Data processing with R tidyverse - November 11-16, 2021` +<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a> </center> \ No newline at end of file