📜 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:

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, you’re good.


3️⃣ Pulling latest changes from Gitea

Before making edits:

git pull

If it gives an error like “no tracking information”, link the branch:

git branch --set-upstream-to=origin/master master


4️⃣ Making changes & committing

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.

    The Sync Changes button does a push + pull together — good for quick updates.

If anyone gets really stuck, we can reset their local copy with:

git fetch origin
git reset --hard origin/master

⚠ This will erase local changes — use only if you want a clean slate.