From 1e358c1b2bec03aa244c9060e481adde00b1e1ba Mon Sep 17 00:00:00 2001 From: JoshyPoo Date: Thu, 7 Aug 2025 23:04:41 -0500 Subject: [PATCH] Cleaned up the Git How-to a little and made infor more accurate --- How_To_git101.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/How_To_git101.txt b/How_To_git101.txt index 526e412..1fb4910 100644 --- a/How_To_git101.txt +++ b/How_To_git101.txt @@ -1,19 +1,25 @@ 📜 Git Basics for Our Discord Bot Project (so we don’t break things accidentally) -1️⃣ Cloning the repo (first time setup) -Run this in your terminal (replace with the Gitea URL for our project): + +1️⃣ Cloning the repo (***first time setup***) + +Run this in your terminal: git clone https://gitea.wheelytho.com/joshypoo/DiscordTipBot This creates a folder with all the files and already sets up the remote. + + 2️⃣ Making sure you’re on the right branch Check which branch you’re on: git branch -If you see * master (or * main), you’re good. +If you see * master, you’re good. + + 3️⃣ Pulling latest changes from Gitea Before making edits: @@ -24,7 +30,7 @@ If it gives an error like “no tracking information”, link the branch: git branch --set-upstream-to=origin/master master -(or use main if that’s our branch name). + 4️⃣ Making changes & committing After editing files: @@ -32,14 +38,18 @@ After editing files: git add . git commit -m "Describe what you changed" + 5️⃣ Pushing your changes to Gitea git push + 6️⃣ The golden rule Always git pull before you start making changes. It avoids merge conflicts and sadness. + + 7️⃣ VS Code Tip The Source Control tab (Ctrl+Shift+G) lets you stage, commit, and push without typing commands.