From 951f34afdb095e1ca796556bc069c99b0b12aa4e Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Mon, 22 Sep 2025 12:45:03 +0100 Subject: [PATCH 1/8] Feat: Created slides for git --- slides/compsoc/2025-2025/intro_to_git.md | 269 ++++++++++++++++++ slides/compsoc/2025-2025/intro_to_git/NAH.jpg | 3 + .../2025-2025/intro_to_git/bad_message.png | 3 + .../intro_to_git/forgejo_add_secret.png | 3 + .../intro_to_git/forgejo_repo_link.png | 3 + .../intro_to_git/forgejo_repo_settings.png | 3 + .../intro_to_git/forgejo_secrets_location.png | 3 + .../intro_to_git/forgejo_ssh_key_example.png | 3 + .../intro_to_git/forgejo_template_button.png | 3 + .../forgejo_template_repo_creation.png | 3 + .../intro_to_git/git_download_button.png | 3 + .../2025-2025/intro_to_git/git_installer.png | 3 + .../git_installer_checkout_unix.png | 3 + .../git_installer_default_rebase_pull.png | 3 + ...it_installer_notepad_as_default_editor.png | 3 + .../git_installer_rename_master_to_main.png | 3 + .../permission_denied_publickey.jpg | 3 + 17 files changed, 317 insertions(+) create mode 100644 slides/compsoc/2025-2025/intro_to_git.md create mode 100644 slides/compsoc/2025-2025/intro_to_git/NAH.jpg create mode 100644 slides/compsoc/2025-2025/intro_to_git/bad_message.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_add_secret.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_repo_link.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_repo_settings.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_secrets_location.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_ssh_key_example.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_template_button.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/forgejo_template_repo_creation.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_download_button.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_installer.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_installer_checkout_unix.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_installer_default_rebase_pull.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_installer_notepad_as_default_editor.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/git_installer_rename_master_to_main.png create mode 100644 slides/compsoc/2025-2025/intro_to_git/permission_denied_publickey.jpg diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md new file mode 100644 index 0000000..b2e6354 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -0,0 +1,269 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +title = "Git" +date = 2024-09-18 +slides = true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +# Git + +------------------------------------------------------------------------- + +Git is tool that's used in the programming industry. + +------------------------------------------------------------------------- + +Another name for Git is a Version Control System (VCS) tool. + +------------------------------------------------------------------------- + +Specifically to track project work done, and the changes to files we've made. + +------------------------------------------------------------------------- + +The more correct term is Source Control. + +------------------------------------------------------------------------- + +It is NOT a programming language. + +------------------------------------------------------------------------- + +Git is a tool made for (usually) us programmers to track the work we've done. + +------------------------------------------------------------------------- + +Programmer socks (not) included. + +------------------------------------------------------------------------- + +Now we need to ask WHY. + +------------------------------------------------------------------------- + +Why would we need a tool like this? + +------------------------------------------------------------------------- + +Why not use Google Drive instead? + +------------------------------------------------------------------------- + +I will find your IP address. + +------------------------------------------------------------------------- + +In all honesty, + +------------------------------------------------------------------------- + +It's to help keep track of who did what. + +------------------------------------------------------------------------- + +And to work on unique features... + +------------------------------------------------------------------------- + +without affecting the main area/branch of our work. + +------------------------------------------------------------------------- + +When DO we use git? + +------------------------------------------------------------------------- + +Because Git keeps track of the changes we've made to files, + +------------------------------------------------------------------------- + +We can then use it to commit and stage these files, + +------------------------------------------------------------------------- + +and push them to a place where we can store them. + +------------------------------------------------------------------------- + +This place is called a Repository. + +------------------------------------------------------------------------- + +Repositories are hosted on websites like GitLab, GitHub and Forgejo. + +------------------------------------------------------------------------- + +But, an interesting feature of git, is that it allows you to time-travel. + +------------------------------------------------------------------------- + +Meaning that if a project breaks, you can go back to before it broke. + +------------------------------------------------------------------------- + +Now I hear you in the audience asking... + +------------------------------------------------------------------------- + +Why not use SVN? + +------------------------------------------------------------------------- + +The answer is simple. + +------------------------------------------------------------------------- + +![NAH](intro_to_git/NAH.jpg) + +------------------------------------------------------------------------- + +An actual answer is that Git is Distributed, and SVN in centralized. + +------------------------------------------------------------------------- + +Simply put, devs can store their changes locally on their machines, + +------------------------------------------------------------------------- + +where on SVN they're stored on a central system. + +------------------------------------------------------------------------- + +With a central system you NEED to be connected at all times to work on it. + +------------------------------------------------------------------------- + +You can work locally on git without having to be connected, + +------------------------------------------------------------------------- + +and then push once you're reconnected. + +------------------------------------------------------------------------- + +Back to git. + +------------------------------------------------------------------------- + +Let's start with the basics. + +------------------------------------------------------------------------- + +# Live demonstration time + +Please get your laptop out + +------------------------------------------------------------------------- + +How to download git & git LFS + +------------------------------------------------------------------------- + +## Download +<> + +------------------------------------------------------------------------- + +![img.png](intro_to_git/git_download_button.png) + +------------------------------------------------------------------------- + +![img_1.png](intro_to_git/git_installer.png) + +------------------------------------------------------------------------- + +![img_2.png](intro_to_git/git_installer_notepad_as_default_editor.png) + +------------------------------------------------------------------------- + +![img_3.png](intro_to_git/git_installer_rename_master_to_main.png) + +------------------------------------------------------------------------- + +![img_4.png](intro_to_git/git_installer_checkout_unix.png) + +------------------------------------------------------------------------- + +![img_5.png](intro_to_git/git_installer_default_rebase_pull.png) + +------------------------------------------------------------------------- + +<> + + +------------------------------------------------------------------------- +Don't do this +![BAD](intro_to_git/bad_message.png) + +------------------------------------------------------------------------- + +![img_6.png](intro_to_git/forgejo_template_button.png) + +------------------------------------------------------------------------- + +![img_7.png](intro_to_git/forgejo_template_repo_creation.png) + +------------------------------------------------------------------------- + +![img_8.png](intro_to_git/forgejo_repo_link.png) + +------------------------------------------------------------------------- + +LFS Install + +------------------------------------------------------------------------- + +````bash +git lfs install +```` + +------------------------------------------------------------------------- + +Setup SSH key (see Readme.md)) + +------------------------------------------------------------------------- + +![img_9.png](intro_to_git/forgejo_repo_settings.png) + +------------------------------------------------------------------------- + +![img_10.png](intro_to_git/forgejo_secrets_location.png) + +------------------------------------------------------------------------- + +![img_12.png](intro_to_git/forgejo_add_secret.png) + +------------------------------------------------------------------------- + +![img_11.png](intro_to_git/forgejo_ssh_key_example.png) + +------------------------------------------------------------------------- + +````bash +git init +git remote add origin +git pull origin +git add +git commit -m "" +git push origin +```` +------------------------------------------------------------------------- + +``https://.users.skynet.ie/`` + +------------------------------------------------------------------------- + +TroubleShooting + +------------------------------------------------------------------------- + +If you see this: + +![img_13.png](intro_to_git/permission_denied_publickey.jpg) + +> Credit: Geeks for Geeks + +------------------------------------------------------------------------- + +Go here: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent + +------------------------------------------------------------------------- \ No newline at end of file diff --git a/slides/compsoc/2025-2025/intro_to_git/NAH.jpg b/slides/compsoc/2025-2025/intro_to_git/NAH.jpg new file mode 100644 index 0000000..46a5931 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/NAH.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b93ccc50179e98170010e340bc6f44382e993e78fe6f46d06912da25acd4c43 +size 18232 diff --git a/slides/compsoc/2025-2025/intro_to_git/bad_message.png b/slides/compsoc/2025-2025/intro_to_git/bad_message.png new file mode 100644 index 0000000..8d1b2a0 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/bad_message.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca10627c4c15cac9718378ba7cc16b20b74a571a21e1c1658de8fe82bf71a7e8 +size 143553 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_add_secret.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_add_secret.png new file mode 100644 index 0000000..90192ff --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_add_secret.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11098766d2846bd3f96e4ca4fd0bde143de0e729aada9bfd2edbebcecb142ae6 +size 2832 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_link.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_link.png new file mode 100644 index 0000000..ec7092c --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_link.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3660f02d595cbeb89b0065a332142ce842e45278dc294a8e25f411b557c1c4da +size 8120 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_settings.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_settings.png new file mode 100644 index 0000000..3546f1e --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_repo_settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f18da7c01ac92591cf959576833ca9ed497d6eb1b97bd964f36f435d76e3281 +size 5165 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_secrets_location.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_secrets_location.png new file mode 100644 index 0000000..51f7b8a --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_secrets_location.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9341c7c436972b714a18660fdfac823e0c316f6b70dc4f49b1f76227b278e9b3 +size 10243 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_ssh_key_example.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_ssh_key_example.png new file mode 100644 index 0000000..5337da1 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_ssh_key_example.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e31c9482b2fd2c91bb8511d02259d8b93b867697b5c6fdf86a93871ffd79caf +size 20991 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_template_button.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_template_button.png new file mode 100644 index 0000000..0976615 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_template_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbfcc005d311e1e84b5a7ecbd8572f0384db6618041e89f3caa6457e5670fd6d +size 50537 diff --git a/slides/compsoc/2025-2025/intro_to_git/forgejo_template_repo_creation.png b/slides/compsoc/2025-2025/intro_to_git/forgejo_template_repo_creation.png new file mode 100644 index 0000000..87429a0 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/forgejo_template_repo_creation.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47dae1990bfd43afb40bbf08fa06fc7f3ac361c8dbb705c8f2ebd0668fb03fae +size 36306 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_download_button.png b/slides/compsoc/2025-2025/intro_to_git/git_download_button.png new file mode 100644 index 0000000..c42e917 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_download_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f129a2c0ffaab3d3347a613d7c6b081801b8fcf35f74c6e18e2a776389bc8020 +size 66338 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_installer.png b/slides/compsoc/2025-2025/intro_to_git/git_installer.png new file mode 100644 index 0000000..075d1fb --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_installer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cac6c961d163603314e590d2ac21012e54d0297d6a5c680a1278dd3fe9f3a83d +size 21709 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_installer_checkout_unix.png b/slides/compsoc/2025-2025/intro_to_git/git_installer_checkout_unix.png new file mode 100644 index 0000000..a800f3b --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_installer_checkout_unix.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a29a7010fe4f61daf8f11ccdab87f1866d00d1f9fb403e4e4879e17b8a60882 +size 24415 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_installer_default_rebase_pull.png b/slides/compsoc/2025-2025/intro_to_git/git_installer_default_rebase_pull.png new file mode 100644 index 0000000..f33babb --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_installer_default_rebase_pull.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f7ec846689414760e50d83c027cf0ca3d8d0b6bde7e6ed44e8bfb95d3e23999 +size 17633 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_installer_notepad_as_default_editor.png b/slides/compsoc/2025-2025/intro_to_git/git_installer_notepad_as_default_editor.png new file mode 100644 index 0000000..1b6a50f --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_installer_notepad_as_default_editor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede2529a17922022246252dd9d7e93c8295a15ad53f92add4202037f2cc75ea4 +size 12213 diff --git a/slides/compsoc/2025-2025/intro_to_git/git_installer_rename_master_to_main.png b/slides/compsoc/2025-2025/intro_to_git/git_installer_rename_master_to_main.png new file mode 100644 index 0000000..7072736 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/git_installer_rename_master_to_main.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25da12821d1dca87684b38ed88a5e731386bcd5de0a650994f29339136af6aec +size 20301 diff --git a/slides/compsoc/2025-2025/intro_to_git/permission_denied_publickey.jpg b/slides/compsoc/2025-2025/intro_to_git/permission_denied_publickey.jpg new file mode 100644 index 0000000..3223705 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/permission_denied_publickey.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31aefed484217d5536232437904573768e62e53693f611d7ee68c450559692e0 +size 23819 From d53435b39092fed53e63af8455fae31ec0567840 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Mon, 22 Sep 2025 13:35:15 +0100 Subject: [PATCH 2/8] WIP: git slides WIP --- slides/compsoc/2025-2025/intro_to_git.md | 176 +++++++++++++++++++---- 1 file changed, 151 insertions(+), 25 deletions(-) diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md index b2e6354..c2972fd 100644 --- a/slides/compsoc/2025-2025/intro_to_git.md +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -1,8 +1,12 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -title = "Git" -date = 2024-09-18 -slides = true -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- +title: "Intro to git" +sub_title: "Force push" +author: "Prabuddha Hans" +date: "2025-09-22" + +theme: + name: catppuccin-latte +--- # Git @@ -10,231 +14,342 @@ slides = true Git is tool that's used in the programming industry. + + ------------------------------------------------------------------------- Another name for Git is a Version Control System (VCS) tool. + + ------------------------------------------------------------------------- Specifically to track project work done, and the changes to files we've made. + + ------------------------------------------------------------------------- The more correct term is Source Control. + + ------------------------------------------------------------------------- It is NOT a programming language. + + ------------------------------------------------------------------------- Git is a tool made for (usually) us programmers to track the work we've done. + + ------------------------------------------------------------------------- Programmer socks (not) included. + + ------------------------------------------------------------------------- Now we need to ask WHY. + + ------------------------------------------------------------------------- Why would we need a tool like this? + + ------------------------------------------------------------------------- Why not use Google Drive instead? + + ------------------------------------------------------------------------- I will find your IP address. + + ------------------------------------------------------------------------- In all honesty, + + ------------------------------------------------------------------------- It's to help keep track of who did what. + + ------------------------------------------------------------------------- And to work on unique features... + + ------------------------------------------------------------------------- without affecting the main area/branch of our work. + + ------------------------------------------------------------------------- When DO we use git? + + ------------------------------------------------------------------------- Because Git keeps track of the changes we've made to files, + + ------------------------------------------------------------------------- We can then use it to commit and stage these files, + + ------------------------------------------------------------------------- and push them to a place where we can store them. + + ------------------------------------------------------------------------- This place is called a Repository. + + ------------------------------------------------------------------------- Repositories are hosted on websites like GitLab, GitHub and Forgejo. + + ------------------------------------------------------------------------- But, an interesting feature of git, is that it allows you to time-travel. + + ------------------------------------------------------------------------- Meaning that if a project breaks, you can go back to before it broke. + + ------------------------------------------------------------------------- Now I hear you in the audience asking... + + ------------------------------------------------------------------------- Why not use SVN? + + ------------------------------------------------------------------------- The answer is simple. + + ------------------------------------------------------------------------- -![NAH](intro_to_git/NAH.jpg) +![image:width:100%](intro_to_git/NAH.jpg) + + ------------------------------------------------------------------------- An actual answer is that Git is Distributed, and SVN in centralized. + + ------------------------------------------------------------------------- Simply put, devs can store their changes locally on their machines, + + ------------------------------------------------------------------------- where on SVN they're stored on a central system. + + ------------------------------------------------------------------------- With a central system you NEED to be connected at all times to work on it. + + ------------------------------------------------------------------------- You can work locally on git without having to be connected, + + ------------------------------------------------------------------------- and then push once you're reconnected. + + ------------------------------------------------------------------------- Back to git. + + ------------------------------------------------------------------------- Let's start with the basics. + + ------------------------------------------------------------------------- # Live demonstration time Please get your laptop out + + ------------------------------------------------------------------------- How to download git & git LFS + + ------------------------------------------------------------------------- ## Download <> -------------------------------------------------------------------------- - -![img.png](intro_to_git/git_download_button.png) + ------------------------------------------------------------------------- -![img_1.png](intro_to_git/git_installer.png) +![image:width:100%](intro_to_git/git_download_button.png) + + ------------------------------------------------------------------------- -![img_2.png](intro_to_git/git_installer_notepad_as_default_editor.png) +![image:width:100%](intro_to_git/git_installer.png) + + ------------------------------------------------------------------------- -![img_3.png](intro_to_git/git_installer_rename_master_to_main.png) +![image:width:100%](intro_to_git/git_installer_notepad_as_default_editor.png) + + ------------------------------------------------------------------------- -![img_4.png](intro_to_git/git_installer_checkout_unix.png) +![image:width:100%](intro_to_git/git_installer_rename_master_to_main.png) + + ------------------------------------------------------------------------- -![img_5.png](intro_to_git/git_installer_default_rebase_pull.png) +![image:width:100%](intro_to_git/git_installer_checkout_unix.png) + + + +------------------------------------------------------------------------- + +![image:width:100%](intro_to_git/git_installer_default_rebase_pull.png) + + ------------------------------------------------------------------------- <> + ------------------------------------------------------------------------- Don't do this -![BAD](intro_to_git/bad_message.png) +![image:width:100%](intro_to_git/bad_message.png) + + ------------------------------------------------------------------------- -![img_6.png](intro_to_git/forgejo_template_button.png) +![image:width:100%](intro_to_git/forgejo_template_button.png) + + ------------------------------------------------------------------------- -![img_7.png](intro_to_git/forgejo_template_repo_creation.png) +![image:width:100%](intro_to_git/forgejo_template_repo_creation.png) + + ------------------------------------------------------------------------- -![img_8.png](intro_to_git/forgejo_repo_link.png) +![image:width:100%](intro_to_git/forgejo_repo_link.png) + + ------------------------------------------------------------------------- LFS Install + + ------------------------------------------------------------------------- ````bash git lfs install ```` + + ------------------------------------------------------------------------- Setup SSH key (see Readme.md)) -------------------------------------------------------------------------- - -![img_9.png](intro_to_git/forgejo_repo_settings.png) + ------------------------------------------------------------------------- -![img_10.png](intro_to_git/forgejo_secrets_location.png) +![image:width:100%](intro_to_git/forgejo_repo_settings.png) + + ------------------------------------------------------------------------- -![img_12.png](intro_to_git/forgejo_add_secret.png) +![image:width:100%](intro_to_git/forgejo_secrets_location.png) + + ------------------------------------------------------------------------- -![img_11.png](intro_to_git/forgejo_ssh_key_example.png) +![image:width:100%](intro_to_git/forgejo_add_secret.png) + + + +------------------------------------------------------------------------- + +![image:width:100%](intro_to_git/forgejo_ssh_key_example.png) + + ------------------------------------------------------------------------- @@ -246,24 +361,35 @@ git add git commit -m "" git push origin ```` + + + ------------------------------------------------------------------------- ``https://.users.skynet.ie/`` + + ------------------------------------------------------------------------- TroubleShooting + + ------------------------------------------------------------------------- If you see this: -![img_13.png](intro_to_git/permission_denied_publickey.jpg) +![image:width:100%](intro_to_git/permission_denied_publickey.jpg) > Credit: Geeks for Geeks + + ------------------------------------------------------------------------- Go here: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent + + ------------------------------------------------------------------------- \ No newline at end of file From a32b3f58b33175822493ade3f179e09f43f31a74 Mon Sep 17 00:00:00 2001 From: Nanda128 Date: Mon, 22 Sep 2025 17:09:48 +0100 Subject: [PATCH 3/8] slides: update sub-title and improve content for clarity --- slides/compsoc/2025-2025/intro_to_git.md | 194 ++++++++++++------ .../2025-2025/intro_to_git/compsocks.png | 3 + 2 files changed, 132 insertions(+), 65 deletions(-) create mode 100644 slides/compsoc/2025-2025/intro_to_git/compsocks.png diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md index c2972fd..a1d6c20 100644 --- a/slides/compsoc/2025-2025/intro_to_git.md +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -1,6 +1,6 @@ --- title: "Intro to git" -sub_title: "Force push" +sub_title: "git push -f origin main" author: "Prabuddha Hans" date: "2025-09-22" @@ -10,348 +10,407 @@ theme: # Git -------------------------------------------------------------------------- +================================= Git is tool that's used in the programming industry. + -------------------------------------------------------------------------- +================================= Another name for Git is a Version Control System (VCS) tool. + -------------------------------------------------------------------------- +================================= Specifically to track project work done, and the changes to files we've made. + -------------------------------------------------------------------------- +================================= The more correct term is Source Control. + -------------------------------------------------------------------------- +================================= It is NOT a programming language. + -------------------------------------------------------------------------- +================================= Git is a tool made for (usually) us programmers to track the work we've done. + -------------------------------------------------------------------------- +================================= Programmer socks (not) included. +![image:width:100%](intro_to_git/compsocks.png) + + -------------------------------------------------------------------------- +================================= Now we need to ask WHY. + + -------------------------------------------------------------------------- +================================= Why would we need a tool like this? + -------------------------------------------------------------------------- +================================= Why not use Google Drive instead? + -------------------------------------------------------------------------- +================================= I will find your IP address. + -------------------------------------------------------------------------- +================================= In all honesty, + -------------------------------------------------------------------------- +================================= It's to help keep track of who did what. + -------------------------------------------------------------------------- +================================= And to work on unique features... + -------------------------------------------------------------------------- +================================= without affecting the main area/branch of our work. + -------------------------------------------------------------------------- +================================= When DO we use git? + -------------------------------------------------------------------------- +================================= Because Git keeps track of the changes we've made to files, + -------------------------------------------------------------------------- +================================= We can then use it to commit and stage these files, + -------------------------------------------------------------------------- +================================= and push them to a place where we can store them. + -------------------------------------------------------------------------- +================================= This place is called a Repository. + -------------------------------------------------------------------------- +================================= Repositories are hosted on websites like GitLab, GitHub and Forgejo. + -------------------------------------------------------------------------- +================================= But, an interesting feature of git, is that it allows you to time-travel. + -------------------------------------------------------------------------- +================================= Meaning that if a project breaks, you can go back to before it broke. + -------------------------------------------------------------------------- +================================= Now I hear you in the audience asking... + -------------------------------------------------------------------------- +================================= Why not use SVN? + -------------------------------------------------------------------------- +================================= The answer is simple. + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/NAH.jpg) + -------------------------------------------------------------------------- +================================= An actual answer is that Git is Distributed, and SVN in centralized. + -------------------------------------------------------------------------- +================================= Simply put, devs can store their changes locally on their machines, + -------------------------------------------------------------------------- +================================= where on SVN they're stored on a central system. + -------------------------------------------------------------------------- +================================= With a central system you NEED to be connected at all times to work on it. + -------------------------------------------------------------------------- +================================= You can work locally on git without having to be connected, + -------------------------------------------------------------------------- +================================= and then push once you're reconnected. + -------------------------------------------------------------------------- +================================= Back to git. + -------------------------------------------------------------------------- +================================= Let's start with the basics. + -------------------------------------------------------------------------- +================================= # Live demonstration time -Please get your laptop out +Please get your laptops out + -------------------------------------------------------------------------- +================================= -How to download git & git LFS +How to download Git & Git LFS + -------------------------------------------------------------------------- +================================= ## Download <> + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_download_button.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_installer.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_installer_notepad_as_default_editor.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_installer_rename_master_to_main.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_installer_checkout_unix.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/git_installer_default_rebase_pull.png) + -------------------------------------------------------------------------- +================================= <> + -------------------------------------------------------------------------- +================================= Don't do this ![image:width:100%](intro_to_git/bad_message.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_template_button.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_template_repo_creation.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_repo_link.png) + -------------------------------------------------------------------------- +================================= LFS Install + -------------------------------------------------------------------------- +================================= ````bash git lfs install ```` + -------------------------------------------------------------------------- +================================= Setup SSH key (see Readme.md)) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_repo_settings.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_secrets_location.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_add_secret.png) + -------------------------------------------------------------------------- +================================= ![image:width:100%](intro_to_git/forgejo_ssh_key_example.png) + -------------------------------------------------------------------------- +================================= ````bash git init @@ -362,21 +421,24 @@ git commit -m "" git push origin ```` + -------------------------------------------------------------------------- +================================= ``https://.users.skynet.ie/`` + -------------------------------------------------------------------------- +================================= TroubleShooting + -------------------------------------------------------------------------- +================================= If you see this: @@ -384,12 +446,14 @@ If you see this: > Credit: Geeks for Geeks + -------------------------------------------------------------------------- +================================= Go here: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent + -------------------------------------------------------------------------- \ No newline at end of file +================================= diff --git a/slides/compsoc/2025-2025/intro_to_git/compsocks.png b/slides/compsoc/2025-2025/intro_to_git/compsocks.png new file mode 100644 index 0000000..ea19868 --- /dev/null +++ b/slides/compsoc/2025-2025/intro_to_git/compsocks.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5036242eb90cfc6ed14ce104354c3dfd0838293c11bed525adf413b6c6138b6d +size 79001 From f21056566c8304d20aa6065fbb88d480f5e7e9ea Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Sep 2025 22:44:03 +0100 Subject: [PATCH 4/8] slides: got a solid chunk of teh Skynet introduction converted --- slides/skynet/02_setup.md | 143 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 slides/skynet/02_setup.md diff --git a/slides/skynet/02_setup.md b/slides/skynet/02_setup.md new file mode 100644 index 0000000..1100659 --- /dev/null +++ b/slides/skynet/02_setup.md @@ -0,0 +1,143 @@ +--- +title: "Skynet" +sub_title: "Setup Skynet accounts" +author: "Brendan Golden" +date: "2023-09-23" +theme: + name: catppuccin-latte +--- + +Skynet: Setup +================================= + + + +* We are going to divide it into two segments + * ``New Members`` + * ``Returning Members`` +* First up is ``New Members`` + + + +Setup: New Members +================================= + + + +1. Be a fully paid up member of UL Computer Society +2. Go to https://account.skynet.ie/signup. + * Enter the same email used for UL Wolves +3. You will get an email to verify your address, follow the link. +4. Choose a ``username`` and ``password``. +5. Congrats! You are in! _heist music_ + + +Setup: Returning Members +================================= + + +# Set Email + +1. Please go to https://account.skynet.ie/modify. + * Enter the same email used for UL Wolves +2. Congrats! You are in! _heist music_ + +# Recovery +## Forgotten Username +If you have forgotten your ``username``. +Use https://account.skynet.ie/recover/username + +## Forgotten Password +If you have forgotten your ``password``. +Use https://account.skynet.ie/recover/password + + + +Setup: SSH Key +================================= + + +SSH keys are used for a variety of reasons: + + +* Logging into servers + * Authentication +* CI/CD Pipelines + + + +Setup: SSH Key - Creation +================================= + + + +# Prepwork +```bash +cd ~/.ssh +mkdir skynet +cd skynet +``` + +# Creation +```bash +ssh-keygen -t ed25519 -C "" +``` + +* Location: ``$USERNAME`` + * ``$USERNAME`` is your Skynet username. + * For example ``silver`` for me +* Password: Press Enter twice + * This sets no password on the file + +This creates ``$USERNAME.pub`` which we will use later. + + +Setup: SSH Key - Config +================================= + + + +Now we have to create a config file for ssh. + +# Windows +```powershell +cd ../ +"" > config +``` + +# Linux +```bash +cd ../ +touch config +``` + +In that ``config`` file pop this: +``` +Host *.skynet.ie + User $USERNAME + IdentityFile ~/.ssh/skynet/$USERNAME + IdentitiesOnly yes +``` + + +Setup: SSH Key - Account +================================= + + + + +* Now we need to add it to your account. +* Remember the ``$USERNAME.pub`` in ``~/.ssh/skynet`` ? +* We now need to read it + +```bash +cat ~/.ssh/skynet/$USERNAME.pub +``` + + +* Copy the text and go to https://account.skynet.ie/modify +* Select the SSH Key field and submit. + + +Congratulations, you now have full access to all of Skynet's services! +Now to learn _how_ to access them! \ No newline at end of file From c1772650cb3b80c93231604fb78099ad4e09b888 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Mon, 22 Sep 2025 22:54:54 +0100 Subject: [PATCH 5/8] WIP: Fixing up slides 1 Need to figure out how to do the images in a good way. --- slides/compsoc/2025-2025/intro_to_git.md | 298 +++++------------------ 1 file changed, 65 insertions(+), 233 deletions(-) diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md index a1d6c20..47c2fad 100644 --- a/slides/compsoc/2025-2025/intro_to_git.md +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -8,50 +8,19 @@ theme: name: catppuccin-latte --- -# Git - +Git ================================= -Git is tool that's used in the programming industry. + + +* Git is tool that's used in the programming industry. +* Another name for Git is a Version Control System (VCS) tool. +* Specifically to track project work done, and the changes to files we've made. +* The more correct term is Source Control. +* It is NOT a programming language. +* Git is a tool made for (usually) us programmers to track the work we've done. - - -================================= - -Another name for Git is a Version Control System (VCS) tool. - - - - -================================= - -Specifically to track project work done, and the changes to files we've made. - - - - -================================= - -The more correct term is Source Control. - - - - -================================= - -It is NOT a programming language. - - - - -================================= - -Git is a tool made for (usually) us programmers to track the work we've done. - - - - ================================= Programmer socks (not) included. @@ -61,140 +30,42 @@ Programmer socks (not) included. +Why Git ================================= -Now we need to ask WHY. + +* Now we need to ask WHY. +* Why would we need a tool like this? +* Why not use Google Drive instead? +* I will find your IP address. +* In all honesty, +* It's to help keep track of who did what. +* And to work on unique features... +* without affecting the main area/branch of our work. +* When DO we use git? +* Because Git keeps track of the changes we've made to files, +* We can then use it to commit and stage these files, +* and push them to a place where we can store them. + + +Code Storage +================================= + + + +* This place is called a Repository. +* Repositories are hosted on websites like GitLab, GitHub and Forgejo. +* But, an interesting feature of git, is that it allows you to time-travel. +* Meaning that if a project breaks, you can go back to before it broke. +* Now I hear you nerds in the audience asking... +* Why not use SVN? +* The answer is simple. -================================= - -Why would we need a tool like this? - - - - -================================= - -Why not use Google Drive instead? - - - - -================================= - -I will find your IP address. - - - - -================================= - -In all honesty, - - - - -================================= - -It's to help keep track of who did what. - - - - -================================= - -And to work on unique features... - - - - -================================= - -without affecting the main area/branch of our work. - - - - -================================= - -When DO we use git? - - - - -================================= - -Because Git keeps track of the changes we've made to files, - - - - -================================= - -We can then use it to commit and stage these files, - - - - -================================= - -and push them to a place where we can store them. - - - - -================================= - -This place is called a Repository. - - - - -================================= - -Repositories are hosted on websites like GitLab, GitHub and Forgejo. - - - - -================================= - -But, an interesting feature of git, is that it allows you to time-travel. - - - - -================================= - -Meaning that if a project breaks, you can go back to before it broke. - - - - -================================= - -Now I hear you in the audience asking... - - - - -================================= - -Why not use SVN? - - - - -================================= - -The answer is simple. - - - - +No. ================================= ![image:width:100%](intro_to_git/NAH.jpg) @@ -202,78 +73,39 @@ The answer is simple. +WHY don't we use SVN ================================= -An actual answer is that Git is Distributed, and SVN in centralized. + + +* An actual answer is that Git is Distributed, and SVN in centralized. +* Simply put, devs can store their changes locally on their machines. +* Whereas on SVN they're stored on a central system. +* With a central system you NEED to be connected at all times to work on it. +* You can work locally on git without having to be connected, +* and then push once you're reconnected. +* Back to git. +* Let's start with the basics. + + + + +Live demonstration time +================================= + +* Please get your laptops out ================================= -Simply put, devs can store their changes locally on their machines, + -================================= - -where on SVN they're stored on a central system. - - - - -================================= - -With a central system you NEED to be connected at all times to work on it. - - - - -================================= - -You can work locally on git without having to be connected, - - - - -================================= - -and then push once you're reconnected. - - - - -================================= - -Back to git. - - - - -================================= - -Let's start with the basics. - - - - -================================= - -# Live demonstration time - -Please get your laptops out - - - - -================================= - How to download Git & Git LFS - - - - ================================= ## Download @@ -331,8 +163,9 @@ How to download Git & Git LFS +Don't do these types of commit messages ================================= -Don't do this + ![image:width:100%](intro_to_git/bad_message.png) @@ -375,10 +208,9 @@ git lfs install +Setup SSH key (see Readme.md) ================================= -Setup SSH key (see Readme.md)) - @@ -431,16 +263,15 @@ git push origin +TroubleShooting ================================= -TroubleShooting -================================= - If you see this: +================================= ![image:width:100%](intro_to_git/permission_denied_publickey.jpg) @@ -449,9 +280,10 @@ If you see this: +Go here ================================= -Go here: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent +https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent From 66b821ed13c832f1a213a26c253cfddd8027bc18 Mon Sep 17 00:00:00 2001 From: Prabuddha Hans <21313482@studentmail.ul.ie> Date: Mon, 22 Sep 2025 23:49:15 +0100 Subject: [PATCH 6/8] WIP: Fixing up slides 2 Fixed up the empty headers, still need to find a decent way to do images. --- slides/compsoc/2025-2025/intro_to_git.md | 49 +++--------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md index 47c2fad..7921cf6 100644 --- a/slides/compsoc/2025-2025/intro_to_git.md +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -92,16 +92,9 @@ WHY don't we use SVN Live demonstration time ================================= - + * Please get your laptops out - - - -================================= - - - @@ -114,51 +107,39 @@ How to download Git & Git LFS -================================= - ![image:width:100%](intro_to_git/git_download_button.png) -================================= - ![image:width:100%](intro_to_git/git_installer.png) -================================= - ![image:width:100%](intro_to_git/git_installer_notepad_as_default_editor.png) -================================= ![image:width:100%](intro_to_git/git_installer_rename_master_to_main.png) -================================= - ![image:width:100%](intro_to_git/git_installer_checkout_unix.png) -================================= - ![image:width:100%](intro_to_git/git_installer_default_rebase_pull.png) -================================= -<> + @@ -171,34 +152,28 @@ Don't do these types of commit messages -================================= - ![image:width:100%](intro_to_git/forgejo_template_button.png) -================================= - ![image:width:100%](intro_to_git/forgejo_template_repo_creation.png) -================================= - ![image:width:100%](intro_to_git/forgejo_repo_link.png) -================================= - LFS Install +================================= +LFS Install ================================= ````bash @@ -214,36 +189,26 @@ Setup SSH key (see Readme.md) -================================= - ![image:width:100%](intro_to_git/forgejo_repo_settings.png) -================================= - ![image:width:100%](intro_to_git/forgejo_secrets_location.png) -================================= - ![image:width:100%](intro_to_git/forgejo_add_secret.png) -================================= - ![image:width:100%](intro_to_git/forgejo_ssh_key_example.png) -================================= - ````bash git init git remote add origin @@ -256,8 +221,6 @@ git push origin -================================= - ``https://.users.skynet.ie/`` @@ -283,9 +246,7 @@ If you see this: Go here ================================= -https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent + - -================================= From 4d825caf25cb966ddb5ce33a0e9b2aa73b0262c6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 23 Sep 2025 00:00:48 +0100 Subject: [PATCH 7/8] slides: updated teh slide for council this week will be only using teh alst one --- .../council/2025-2026/Semester-1_week-03.md | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/slides/council/2025-2026/Semester-1_week-03.md b/slides/council/2025-2026/Semester-1_week-03.md index 2f586a6..28967d5 100644 --- a/slides/council/2025-2026/Semester-1_week-03.md +++ b/slides/council/2025-2026/Semester-1_week-03.md @@ -29,22 +29,35 @@ https://forgejo.skynet.ie/Skynet/discord-bot/src/branch/main/doc/Committee.md -# Computer Society -## Committee Discord server +# Committee Discord Server -* Augments teh Chairperson Whatsapp - * More than ***just*** Chairperson/President -* Created with blessing of C&S -* For all Clubs/Socs Committees to join. - * Only Committee though - * Need to authenticate using ``/wolves link`` -* Does not rollover each year +* For all Clubs/Societies Committees to join. +* All Committee, not ***just*** Chairperson/President. +* Verifies that you are on at least one committee. +* Each Club/Society has their own ``Channel`` & mentionable ``Role``. -https://discord.gg/D6mbASJKxU + + + +## Join Server +https://committee.discord.skynet.ie ![](./misc/committee-discord.png) + +## Link Discord & Wolves (short ver) + +Ensure you are actually listed as a committee member on Wolves. + +Use ``/wolves link`` with the email you use for Wolves. +An email will be sent to you, paste in the response back to the bot. +``/wolves verify code: aaaaaaaaaaa`` + +You should get roles for whatever committees you are a part of. +This will grant you full access to the server. + +If you have any issues Computer Society is on hand to help. \ No newline at end of file From b8703bf5b28efe636ce2acf183ce5c6df758b34b Mon Sep 17 00:00:00 2001 From: Nanda128 Date: Tue, 23 Sep 2025 00:27:01 +0100 Subject: [PATCH 8/8] slides: enhance content layout and improve visual alignment --- slides/compsoc/2025-2025/intro_to_git.md | 76 +++++++++++------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/slides/compsoc/2025-2025/intro_to_git.md b/slides/compsoc/2025-2025/intro_to_git.md index 7921cf6..eb3ec21 100644 --- a/slides/compsoc/2025-2025/intro_to_git.md +++ b/slides/compsoc/2025-2025/intro_to_git.md @@ -21,17 +21,20 @@ Git * Git is a tool made for (usually) us programmers to track the work we've done. + +Sold Separately ================================= + Programmer socks (not) included. ![image:width:100%](intro_to_git/compsocks.png) - Why Git ================================= + @@ -52,6 +55,7 @@ Why Git Code Storage ================================= + * This place is called a Repository. @@ -62,20 +66,20 @@ Code Storage * Why not use SVN? * The answer is simple. - No. ================================= + ![image:width:100%](intro_to_git/NAH.jpg) - WHY don't we use SVN ================================= + * An actual answer is that Git is Distributed, and SVN in centralized. @@ -87,166 +91,154 @@ WHY don't we use SVN * Back to git. * Let's start with the basics. - Live demonstration time ================================= + + * Please get your laptops out - How to download Git & Git LFS ================================= + + ## Download <> - + ![image:width:100%](intro_to_git/git_download_button.png) - + ![image:width:100%](intro_to_git/git_installer.png) - + ![image:width:100%](intro_to_git/git_installer_notepad_as_default_editor.png) - - + ![image:width:100%](intro_to_git/git_installer_rename_master_to_main.png) - + ![image:width:100%](intro_to_git/git_installer_checkout_unix.png) - + ![image:width:100%](intro_to_git/git_installer_default_rebase_pull.png) - - + - Don't do these types of commit messages ================================= + ![image:width:100%](intro_to_git/bad_message.png) - + ![image:width:100%](intro_to_git/forgejo_template_button.png) - ![image:width:100%](intro_to_git/forgejo_template_repo_creation.png) - + ![image:width:100%](intro_to_git/forgejo_repo_link.png) - + LFS Install ================================= - - -LFS Install -================================= + -````bash -git lfs install -```` - - +Same deal as before, just download and install. +It'll ask to be ran as Administrator, say yes. Setup SSH key (see Readme.md) ================================= - - ![image:width:100%](intro_to_git/forgejo_repo_settings.png) - + ![image:width:100%](intro_to_git/forgejo_secrets_location.png) - + ![image:width:100%](intro_to_git/forgejo_add_secret.png) - + ![image:width:100%](intro_to_git/forgejo_ssh_key_example.png) - + -````bash +```bash git init git remote add origin git pull origin git add git commit -m "" git push origin -```` +``` - + ``https://.users.skynet.ie/`` - TroubleShooting ================================= - - If you see this: ================================= + ![image:width:100%](intro_to_git/permission_denied_publickey.jpg) > Credit: Geeks for Geeks - Go here ================================= + -