Computer_Society/presentations_compsoc
20
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

slides: update sub-title and improve content for clarity

Browse source
This commit is contained in:
Nanda128 2025-09-22 17:09:48 +01:00
parent d53435b390
commit a32b3f58b3
2 changed files with 132 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

194
slides/compsoc/2025-2025/intro_to_git.md
View file

@ -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.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Another name for Git is a Version Control System (VCS) tool.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Specifically to track project work done, and the changes to files we've made.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
The more correct term is Source Control.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
It is NOT a programming language.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Git is a tool made for (usually) us programmers to track the work we've done.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Programmer socks (not) included.
![image:width:100%](intro_to_git/compsocks.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Now we need to ask WHY.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Why would we need a tool like this?
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Why not use Google Drive instead?
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
I will find your IP address.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
In all honesty,
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
It's to help keep track of who did what.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
And to work on unique features...
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
without affecting the main area/branch of our work.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
When DO we use git?
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Because Git keeps track of the changes we've made to files,
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
We can then use it to commit and stage these files,
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
and push them to a place where we can store them.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
This place is called a Repository.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Repositories are hosted on websites like GitLab, GitHub and Forgejo.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
But, an interesting feature of git, is that it allows you to time-travel.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Meaning that if a project breaks, you can go back to before it broke.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Now I hear you in the audience asking...
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Why not use SVN?
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
The answer is simple.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/NAH.jpg)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
An actual answer is that Git is Distributed, and SVN in centralized.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Simply put, devs can store their changes locally on their machines,
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
where on SVN they're stored on a central system.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
With a central system you NEED to be connected at all times to work on it.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
You can work locally on git without having to be connected,
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
and then push once you're reconnected.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Back to git.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Let's start with the basics.
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
# Live demonstration time
Please get your laptop out
Please get your laptops out
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
How to download git & git LFS
How to download Git & Git LFS
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
## Download
<<https://git-scm.com/downloads>>
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_download_button.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_installer.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_installer_notepad_as_default_editor.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_installer_rename_master_to_main.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_installer_checkout_unix.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/git_installer_default_rebase_pull.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
<<https://forgejo.skynet.ie/Skynet/deploy_user>>
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Don't do this
![image:width:100%](intro_to_git/bad_message.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_template_button.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_template_repo_creation.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_repo_link.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
LFS Install
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
````bash
git lfs install
````
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
Setup SSH key (see Readme.md))
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_repo_settings.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_secrets_location.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_add_secret.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
![image:width:100%](intro_to_git/forgejo_ssh_key_example.png)
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
````bash
git init
@ -362,21 +421,24 @@ git commit -m "<commit_message>"
git push origin <branch_name>
````
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
``https://<username>.users.skynet.ie/``
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
TroubleShooting
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
If you see this:
@ -384,12 +446,14 @@ If you see this:
> Credit: Geeks for Geeks
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================
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
<!-- alignment: center -->
<!-- end_slide -->
-------------------------------------------------------------------------
=================================