Here’s a clear, practical guide to Git commands you’ll use in Visual Studio Code (VS Code), with descriptions and when to use them.

🔧 Basic Setup Commands

1. Configure Git (first time)

git config --global user.name "Your Name"
git config --global user.email "your@email.com"

👉 Sets your identity for commits.

git config --list

👉 Shows your current Git configuration.

📁 Repository Commands

2. Initialize a repo

git init

👉 Turns your project folder into a Git repository.

3. Clone a repo

git clone <repo-url>

👉 Downloads an existing repo (e.g., from GitHub).

📊 Checking Status

4. Check current status

git status

👉 Shows:

modified files
staged files
untracked files

➕ Adding & Committing

5. Add files to staging

git add filename

👉 Add one file

git add .

👉 Add all changes

6. Commit changes

git commit -m "Your message"

👉 Saves staged changes with a message.

🔍 Viewing History

7. View commit history

git log

git log --oneline

👉 Short version of history

🔄 Branching

8. Create a branch

git branch branch-name

9. Switch branch

git checkout branch-name

OR (modern way):

git switch branch-name

10. Create + switch branch

git checkout -b branch-name

11. List branches

git branch

🔀 Merging

12. Merge branch

git merge branch-name

👉 Merge another branch into current branch.

🌐 Remote Repositories

13. Add remote

git remote add origin <repo-url>

14. View remotes

git remote -v

15. Push to remote

git push origin branch-name

👉 First push:

git push -u origin branch-name

16. Pull changes

git pull origin branch-name

👉 Fetch + merge

17. Fetch changes only

git fetch

👉 Downloads changes without merging.

🔁 Undo / Fix Mistakes

18. Unstage file

git reset filename

19. Discard changes

git checkout -- filename

20. Reset commits

git reset --soft HEAD~1

👉 Undo last commit, keep changes

git reset --hard HEAD~1

👉 ⚠️ Deletes last commit completely

🧹 Cleaning

21. Remove untracked files

git clean -f

🔐 Stashing (temporary save)

22. Save work temporarily

git stash

23. Restore stash

git stash pop

🧠 Useful VS Code Git Tips

Inside Visual Studio Code you can:

Use Source Control panel (left sidebar)
Click + to stage files
Type commit messages directly
Use built-in buttons for:
- Push / Pull
- Branch switching
- Merge conflict resolution

⭐ Common Workflow (Real Example)

git init
git add .
git commit -m "Initial commit"
git branch -M main
git remote add origin <repo-url>
git push -u origin main

💡 Pro Tips

Commit often with meaningful messages
Use branches for features (feature-login, etc.)
Pull before pushing to avoid conflicts
Use .gitignore to exclude unnecessary files

If you want, I can give you:

🧩 Git commands cheat sheet PDF style
⚔️ Merge conflict solving guide
🚀 Beginner → advanced Git roadmap

🚀 Move Code from Another Branch to `main`

You already pushed your code to a different branch, and now you want it in main. Here are the clean ways to fix it:

✅ Method 1: Merge your branch into `main` (Recommended)

This keeps history clean and safe.

🔹 Step 1: Switch to `main` branch

git checkout main

🔹 Step 2: Pull latest changes (important)

git pull origin main

🔹 Step 3: Merge your branch

Replace your-branch-name with your branch name

git merge your-branch-name

🔹 Step 4: Push to GitHub

git push origin main

✅ Method 2: Push your branch directly into `main` (Quick way)

If you don’t care about keeping the branch:

git push origin your-branch-name:main

👉 This sends your branch code directly to main.

✅ Method 3: Use GitHub UI (Easiest)

Go to GitHub
Open your repository
You’ll see a button like “Compare & pull request”
Click it → Create Pull Request → Merge into main

⚠️ Tips

If there are conflicts, Git will ask you to fix them before merging
Always pull the latest main before merging
Don’t delete your branch until everything works

Just tell me 👍

FilesExpand file tree

README.md

Latest commit

History