diff --git a/2023/2023-10-05_gitober-part2/slides/add-to-workspace.md b/2023/2023-10-05_gitober-part2/slides/add-to-workspace.md new file mode 100644 index 0000000000000000000000000000000000000000..80353274b6e30dfb86265aae8dfc14bafc23b626 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/add-to-workspace.md @@ -0,0 +1,9 @@ +# Add an already locally existing repository to workspace + + If you already have downloaded a repository, you can add it to VS code by following: + +- Go to **File > Add Folder to Workspace** + +<center> +<img width="30%" src="slides/img/add-root-folder.png"> +</center> \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/best_practices.md b/2023/2023-10-05_gitober-part2/slides/best_practices.md new file mode 100644 index 0000000000000000000000000000000000000000..e8a813043ef13ea58250051cba093d336c101c69 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/best_practices.md @@ -0,0 +1,7 @@ +# Best practices + +* Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop` +* Do **not commit** to `master`/`develop`, but **submit a merge request (MR)** +* Get your code **reviewed** by your peers (submit a merge request!) +* Submit a merge request **often**! (as soon as the feature is ready) +* Make commits often (keeps increments small) diff --git a/2023/2023-10-05_gitober-part2/slides/branch.md b/2023/2023-10-05_gitober-part2/slides/branch.md new file mode 100644 index 0000000000000000000000000000000000000000..ad55d9746aa3360ff3ceffb3e4f48b2bf0a0fc82 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/branch.md @@ -0,0 +1,13 @@ +# Create a new branch + +As part of the workflow, create a branch before starting to work. + +- Click on branch symbol (bottom left) + + <img height="100px" src="slides/img/branch.png"> + +- Choose "+ Create New Branch from..." +- Give the name to your new branch +- Select `origin/develop` + +<img src="slides/img/icon-live-demo.png" height="100px"> diff --git a/2023/2023-10-05_gitober-part2/slides/clone.md b/2023/2023-10-05_gitober-part2/slides/clone.md new file mode 100644 index 0000000000000000000000000000000000000000..87a7a608bf4fb42cc1d55b4d3c88b4c2daa8bc12 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/clone.md @@ -0,0 +1,25 @@ +# Clone your fork + +Every repository is on the server. If you want to contribute using VS code, you need to download it to your laptop. + +In git jargon: you need you *clone your fork*: +- Go to your projects (top left corner with LCSB logo) +- Find **basic-practice-pages** project under your name (your fork) +- Press *Clone* and then *Clone with SSH*. URL will be in your clipboard now. +<img width="60%" src="slides/img/clone.png"> +- Switch to VS Code. Go to `View` > `Command Palette` and type "clone" + + + + +# Clone your fork + +- You will be asked for the URL of the remote repository (you have it in your clipboard now) + + <img height="100px" src="slides/img/clone-SSH.png"> +- and the place where to put files on your computer. + + <img height="400px" src="slides/img/clone-folder.png"> +- To start working, you can now click on "Add to workspace" + + <img height="100px" src="slides/img/add-to-workspace.png"> diff --git a/2023/2023-10-05_gitober-part2/slides/commit.md b/2023/2023-10-05_gitober-part2/slides/commit.md new file mode 100644 index 0000000000000000000000000000000000000000..248c259c81ef8403658024074f3932ad6ba27bcc --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/commit.md @@ -0,0 +1,15 @@ +# Make changes and commit them + +When you change a file, save them by clicking on `File > Save` or by hitting a shortcut (`CTRL + S` or `Command + S`). + + On the left side, observe the git icon. + +<br> +To commit your changes: + +1. Go to Source Control in Activity Bar +2. Stage all changes you want to commit (press +) +3. Describe your changes in commit message +4. Commit your changes (press "tick") + +<img src="slides/img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/fork.md b/2023/2023-10-05_gitober-part2/slides/fork.md new file mode 100644 index 0000000000000000000000000000000000000000..c8d27934ec97f2b213be08f1a7fd42c52e1b6a89 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/fork.md @@ -0,0 +1,17 @@ +# Fork the upstream repository + + +If you recently contributed to the upstream repository, please delete the fork and start over (`Settings` > `General` > `Advanced` > `Delete project`) + +<div class="fragment"> +<br> +If you do not have write access to the `upstream` repository, you have to fork it (as seen in the previous course): + +- make it `public` or `private` depending on upstream repository +- select your namespace + +<center> +<img width="50%" src="slides/img/fork.png"> +</center> + +<img src="slides/img/icon-live-demo.png" height="100px"> Go to [https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages](https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages) and fork. \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/gui.md b/2023/2023-10-05_gitober-part2/slides/gui.md new file mode 100644 index 0000000000000000000000000000000000000000..11998bd203e1462efc119a3e85b2465c5206e379 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/gui.md @@ -0,0 +1,20 @@ +# Visual Studio Code - Graphical User Interface (GUI) + +<img src="slides/img/icon-live-demo.png" height="100px"> GUI for VS code + +<center> +<img src="slides/img/VSCodeGUI.png" width="60%"> +</center> + + + +# Visual Studio Code - Graphical User Interface (GUI) + + +- **Activity Bar** - Located on the left side, this lets you switch between views and gives you additional context-specific indicators, like the number of changes when Git is enabled. +- **Side Bar** - Contains information to assist while working on your project. +- **Editor** - The main area to edit files. You can open as many editors as you like side by side vertically and horizontally. +- **Panels** - You can display different panels below the editor region for output or debug information, errors and warnings, or an integrated terminal. +- **Status Bar** - Information about the opened project and the files you edit. + +Source: VS code documentation \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/ide.md b/2023/2023-10-05_gitober-part2/slides/ide.md new file mode 100644 index 0000000000000000000000000000000000000000..12af1c7d3057c94abd7de1a0cd76333c2b19b524 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/ide.md @@ -0,0 +1,18 @@ +# Integrated development environment (IDE) + +Most of you already know how to contribute to a repository directly online via Gitlab's Web IDE ([Trilogy of git, Part I](https://courses.lcsb.uni.lu/2022-05-31_git-trilogy-part-1/)). + +However, Gitlab's Web IDE is rather limited if you want to: + +- work efficiently +- work with several repositories at the same time +- work offline +- make changes to several documents all at once +- use find/replace features +- ... + +In this course we will learn how to contribute to a common project working on you laptop via [Visual Studio Code](https://code.visualstudio.com/) (VS Code): +- Available for macOS, Linux, and Windows +- Open source (free) +- Easy to contribute using `git` +- Powerful tool and widely used diff --git a/2023/2023-10-05_gitober-part2/slides/img/MRright.png b/2023/2023-10-05_gitober-part2/slides/img/MRright.png new file mode 100644 index 0000000000000000000000000000000000000000..e57f3b26e8fea1b132fb10d9b3e4bbdf83becc34 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/MRright.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/MRwrong.png b/2023/2023-10-05_gitober-part2/slides/img/MRwrong.png new file mode 100644 index 0000000000000000000000000000000000000000..8b75db6f3ce83ab3356ab282e677d0e0a26004db Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/MRwrong.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/VSCodeGUI.png b/2023/2023-10-05_gitober-part2/slides/img/VSCodeGUI.png new file mode 100644 index 0000000000000000000000000000000000000000..68e951d9e21b734d403a37f11c40f19800a603c2 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/VSCodeGUI.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/add-root-folder.png b/2023/2023-10-05_gitober-part2/slides/img/add-root-folder.png new file mode 100644 index 0000000000000000000000000000000000000000..83cc0357f8f6d9d2b8bcdf7038bca2e7fc796d2a Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/add-root-folder.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/add-to-workspace.png b/2023/2023-10-05_gitober-part2/slides/img/add-to-workspace.png new file mode 100644 index 0000000000000000000000000000000000000000..a6769724bb4175798a4e1e4542f8c99d2d195133 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/add-to-workspace.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/addFolder.png b/2023/2023-10-05_gitober-part2/slides/img/addFolder.png new file mode 100644 index 0000000000000000000000000000000000000000..8ddc08f9b5474d1e5cb453e7366fd83bfd0ecb0f Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/addFolder.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/addProject.png b/2023/2023-10-05_gitober-part2/slides/img/addProject.png new file mode 100644 index 0000000000000000000000000000000000000000..aa8b6be1bdd10bf68f6691d21c9c4d5095c323c9 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/addProject.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/addSSH.png b/2023/2023-10-05_gitober-part2/slides/img/addSSH.png new file mode 100644 index 0000000000000000000000000000000000000000..5202e86fff7e47ff8b13d608003bbce02601113b Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/addSSH.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/addSSHavatar.png b/2023/2023-10-05_gitober-part2/slides/img/addSSHavatar.png new file mode 100644 index 0000000000000000000000000000000000000000..bb153125b504a4fb9cec0e72990ecef18f81e545 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/addSSHavatar.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/branch.png b/2023/2023-10-05_gitober-part2/slides/img/branch.png new file mode 100644 index 0000000000000000000000000000000000000000..00946f3ea8bf2075a6ec9ee61cf91a15835b4db5 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/branch.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/bulb.png b/2023/2023-10-05_gitober-part2/slides/img/bulb.png new file mode 120000 index 0000000000000000000000000000000000000000..67b432e55818c5339d08ce64c40e187829c8cfdf --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/img/bulb.png @@ -0,0 +1 @@ +../../../../2021/2021-03-18_basicGitTraining/slides/img/bulb.png \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/img/clone-SSH.png b/2023/2023-10-05_gitober-part2/slides/img/clone-SSH.png new file mode 100644 index 0000000000000000000000000000000000000000..510730814e2819cab2bd6fb42be98ba3fcd79eb9 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/clone-SSH.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/clone-folder.png b/2023/2023-10-05_gitober-part2/slides/img/clone-folder.png new file mode 100644 index 0000000000000000000000000000000000000000..64add3c594866e6972997bc509a5c3825d0ccdf2 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/clone-folder.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/clone.png b/2023/2023-10-05_gitober-part2/slides/img/clone.png new file mode 100644 index 0000000000000000000000000000000000000000..ba044e45df927f23db7313d5edd9a3cde764c7ca Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/clone.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/favicon.ico b/2023/2023-10-05_gitober-part2/slides/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9b935c03f6f841601835db006ed02b582166cdc8 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/favicon.ico differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/fork.png b/2023/2023-10-05_gitober-part2/slides/img/fork.png new file mode 100644 index 0000000000000000000000000000000000000000..c1357cc283ced74bc7cbc6c6b4ef0524e33110b5 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/fork.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png b/2023/2023-10-05_gitober-part2/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..9b2cc2475efff822f8eff39d8b810efad1c8e6f3 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/hero.png b/2023/2023-10-05_gitober-part2/slides/img/hero.png new file mode 100644 index 0000000000000000000000000000000000000000..0eaed961217ea1b9a3ecab527fe0bbbfc7c0c18c Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/hero.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/icon-live-demo.png b/2023/2023-10-05_gitober-part2/slides/img/icon-live-demo.png new file mode 120000 index 0000000000000000000000000000000000000000..ffbc30695d9b150f490f333033c7a4df5a93c9f7 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/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/2023/2023-10-05_gitober-part2/slides/img/mergeCheck.png b/2023/2023-10-05_gitober-part2/slides/img/mergeCheck.png new file mode 100644 index 0000000000000000000000000000000000000000..da7af1a413dd253c8959c24c8d31126b13fb13ce Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/mergeCheck.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/mergePublishedBranch.png b/2023/2023-10-05_gitober-part2/slides/img/mergePublishedBranch.png new file mode 100644 index 0000000000000000000000000000000000000000..43dbb0153055b4cec43b1373202847a8cef08fe3 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/mergePublishedBranch.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/mergeRepoBranches.png b/2023/2023-10-05_gitober-part2/slides/img/mergeRepoBranches.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd073596d2a85c48ce486d8497d323cbd7a17ca Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/mergeRepoBranches.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/publish.png b/2023/2023-10-05_gitober-part2/slides/img/publish.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa29e4a9f4828b1f57f428e94d729579c461a0a Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/publish.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/push.png b/2023/2023-10-05_gitober-part2/slides/img/push.png new file mode 100644 index 0000000000000000000000000000000000000000..37e034629710bba43553305f849b990c506dd504 Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/push.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/img/r3-training-logo.png b/2023/2023-10-05_gitober-part2/slides/img/r3-training-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..48a3aeaa54640a2bde1d4534dd9922d2ea90840c Binary files /dev/null and b/2023/2023-10-05_gitober-part2/slides/img/r3-training-logo.png differ diff --git a/2023/2023-10-05_gitober-part2/slides/index.md b/2023/2023-10-05_gitober-part2/slides/index.md new file mode 100644 index 0000000000000000000000000000000000000000..e1e076e1a33157ec77ee52b6ac48b02c587a6356 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/index.md @@ -0,0 +1,20 @@ +# R3.school + +## October 5th, 2023 + +<div style="top: 6em; left: 0%; position: absolute;"> + <img src="theme/img/lcsb_bg.png"> +</div> + +<div style="top: 5em; left: 60%; position: absolute;"> + <img src="slides/img/r3-training-logo.png" height="200px"> + <br><br><br> + <h1>Gitober part - Part II</h1> + <h2>Contribute using Visual Studio Code</h2> + <br><br><br> + <h4> + Jenny Tran, Data Steward<br><br> + R3 Team - <a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a><br> + <i>Luxembourg Centre for Systems Biomedicine</i> + </h4> +</div> diff --git a/2023/2023-10-05_gitober-part2/slides/list.json b/2023/2023-10-05_gitober-part2/slides/list.json new file mode 100644 index 0000000000000000000000000000000000000000..efa9e9d33e0e9489fe917dbd7700964752b72949 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/list.json @@ -0,0 +1,17 @@ +[ + { "filename": "index.md" }, + { "filename": "ide.md" }, + { "filename": "gui.md" }, + { "filename": "ssh.md" }, + { "filename": "workflow.md" }, + { "filename": "fork.md" }, + { "filename": "clone.md" }, + { "filename": "add-to-workspace.md" }, + { "filename": "branch.md" }, + { "filename": "commit.md" }, + { "filename": "push.md" }, + { "filename": "merge.md" }, + { "filename": "best_practices.md" }, + { "filename": "thanks.md" } +] + diff --git a/2023/2023-10-05_gitober-part2/slides/merge.md b/2023/2023-10-05_gitober-part2/slides/merge.md new file mode 100644 index 0000000000000000000000000000000000000000..69f0cbd87d7ee77edd560133e3ad77023f9ca01e --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/merge.md @@ -0,0 +1,36 @@ +# Merge your changes to original repository via **Merge Request** + +Now your changes are in your fork on the server. + +If you want to incorporate your work into original (upstream) repository, submit a **Merge Request** via the Gitlab interface. + +- If you just published branch, click "Create merge request" + +<center> +<img width="30%" src="slides/img/mergePublishedBranch.png"> +</center> + +- If the button does not show up, go to `Repository > Branches` and click on `Merge request` for the branch you want to merge. + +<center> +<img width="50%" src="slides/img/mergeRepoBranches.png"> +</center> + + + + +# Merge your changes to original repository via **Merge Request** + +- Make sure you are merging the *new* branch from **your fork** to the *develop* branch in **original repository** + +<center> +<img height="130px" src="slides/img/MRwrong.png"> +<img height="130px" src="slides/img/MRright.png"> +</center> + +- Give a meaningful title (start with "Draft:" if you are planning to continue work on this feature). +- Tick `Delete source branch when merge request is accepted.` + +<center> +<img height="430px" src="slides/img/mergeCheck.png"> +</center> \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/push.md b/2023/2023-10-05_gitober-part2/slides/push.md new file mode 100644 index 0000000000000000000000000000000000000000..491d419200debd7400358c0a4eb9e9baa5419e84 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/push.md @@ -0,0 +1,15 @@ +# Save your changes to server - push them + +Your changes are saved and committed locally. + +You need to save them on server. In git jargon: you need to *push them into your fork*. + +2 scenarios: + +- If you created branch locally, it does not exist yet on the server. You need to click on `Publish Branch` first: + +<img height="230px" src="slides/img/publish.png"> + +For all future changes or when the branch already existed, click on `Sync changes`: + +<img height="330px" src="slides/img/push.png"> \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/ssh.md b/2023/2023-10-05_gitober-part2/slides/ssh.md new file mode 100644 index 0000000000000000000000000000000000000000..1436f947314292c1a4e310d6d937020f3f8e4709 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/ssh.md @@ -0,0 +1,60 @@ +# Key-based authentication + +When communicating with the Gitlab server, you need credentials (username and password). Disadvantage: you have to enter the password every time. + +Better: identify your laptop once, and then you do not need to enter the credentials anymore. + +You need to do this setup just once (and repeat if you change your computer).<br> +- Open VS code +- Browse to `Terminal` > `New Terminal` +- Type this command at the command prompt: `ssh-keygen -t ed25519 -C firstname.lastname@uni.lu` +- Accept the suggested filename and directory (press `Enter`): + ``` + Generating public/private ed25519 key pair. + Enter file in which to save the key (/home/user/.ssh/id_ed25519): + ``` + +- Press `Enter` (entering the passphrase is optional). + + + +# Key-based authentication + +A public and private key are generated and stored in specific location on your laptop. Now you need to add the public key to your GitLab account: + +Copy the contents of your public key file: +- macOS: `tr -d '\n' < ~/.ssh/id_ed25519.pub | pbcopy` +- Windows: `cat ~/.ssh/id_ed25519.pub | clip` + +Now, let's move to GitLab https://gitlab.lcsb.uni.lu/ + +- On the top bar, in the top right corner, select your avatar, then `Preferences`. +<center> +<img height="200px" src="slides/img/addSSHavatar.png"> +</center> + + + +# Key-based authentication + +- On the left side, select **SSH Keys**. +- In the **Key** box, paste the copied public key. Make sure it starts with *ssh-ed25519* and finishes with your e-mail. +- In the **Title** box, type a description, like *Work Laptop*.<br> +<center> +<img width="60%" src="slides/img/addSSH.png"> +</center> + + + +# Key-based authentication + +Verify that you connect by typing in the Terminal of VS code: +```bash +ssh -p 8022 -T git@gitlab.lcsb.uni.lu +``` + +The first time, you have to enter `Yes` at the displayed question. Once successful, this should display something like: +```bash +$ ssh -p 8022 -T git@gitlab.lcsb.uni.lu +Welcome to GitLab, @firstname.lastname +``` \ No newline at end of file diff --git a/2023/2023-10-05_gitober-part2/slides/thanks.md b/2023/2023-10-05_gitober-part2/slides/thanks.md new file mode 100644 index 0000000000000000000000000000000000000000..542789e5512f6c5c808baa9e8995a55a2a41f761 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/thanks.md @@ -0,0 +1,8 @@ +# Thank you. + +<center><img src="slides/img/r3-training-logo.png" height="200px"></center> + +Contact us if you need help: + +<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a> + diff --git a/2023/2023-10-05_gitober-part2/slides/workflow.md b/2023/2023-10-05_gitober-part2/slides/workflow.md new file mode 100644 index 0000000000000000000000000000000000000000..c4d971001f3534fe8f5d84bba45dd413f54c2340 --- /dev/null +++ b/2023/2023-10-05_gitober-part2/slides/workflow.md @@ -0,0 +1,13 @@ +# Typical workflow (revisited) + +- Create your own copy of the original (also called `upstream`) repository (`fork` in `git` jargon) +- Download your copy to your computer (`clone` in `git` jargon) +- Create a new branch +- Make changes +- Commit changes +- <font color="red">Push changes to server</font> +- Create merge request to upstream repository + +<center> +<img width="60%" src="slides/img/fork_branch-diagram-after-commit-with-back-arrow.png"> +</center> \ No newline at end of file diff --git a/theme b/theme index a9fbf17aa4e39a5428ace6aeebc091f9afbc4b17..04d9bfc6d2958e1ebf769a602a9a02ab119eee56 160000 --- a/theme +++ b/theme @@ -1 +1 @@ -Subproject commit a9fbf17aa4e39a5428ace6aeebc091f9afbc4b17 +Subproject commit 04d9bfc6d2958e1ebf769a602a9a02ab119eee56