How to Use Git Stash and Git Reset for Developers

🚀 Let’s Talk About GIT (The One That Saves Our Careers 😅) Ever made changes to your code… and then immediately regretted it? Yep. We’ve all been there 🤦♂️ That’s exactly why GIT exists — it’s a Version Control System and Source Code Manager, aka the time machine for developers. It tracks your files, remembers every change, and lets you go back in time when things break (which they do… very often 😌). 🏠 Local Repo vs 🌍 Remote Repo Your Local Repository is stored right in your system inside a hidden .git folder. Think of it like your personal diary 📒 — all your changes, commits, and coding experiments live there. Then we have the Remote Repository on platforms like GitHub, GitLab, and Bitbucket — which is basically the backup cloud + team collaboration zone. This is where everyone sees your work (so don’t push broken code, unless you enjoy chaos 😜). 🔄 The 3 Stages of Git (The Journey of a File) 1️Working Directory – where you write and edit code. Your file is just living life, minding its own business. Git knows it exists, but doesn’t track changes yet. 2️ Staging Area – you run git add, and Git says: “Ahh yes, I will remember this.” ✅ Now your changes are marked to be saved. 3️ Repository – when you git commit, your changes officially enter history 📜 Push them to the remote, and voilà → your teammates can now see (and judge) your work 😆 🧠 Some Terms You Will Hear 100 Times git rm --cached → “Oops, I didn’t mean to track that file!” .gitignore → “Dear Git, please pretend this file doesn’t exist 👀” git config → Your identity inside Git (because being anonymous is weird 😂) git reset → The Undo button we pretend we don’t rely on… but we do… heavily. And yes: git reset --hard HEAD~1 Will erase your latest commit AND your changes. Use it with the emotional seriousness of cutting your own hair ✂️ Meanwhile: git reset --soft HEAD~1 Is more like: “Undo, but keep everything… I’m not ready to let go yet.” ❤️ 🛠️ Handy Git Commands We Use Daily git init git status git add . git commit -m "Fixed something. Probably." git log git show <commit_id> git rm --cached <file> (Yes, we Google them every time… no judgement here 🤝) 💡 Final Thought Git isn’t just a tool. It’s the software world’s relationship counselor — keeping multiple developers working together without destroying each other’s work 😂 #Git #GitHub #VersionControl #DevOps #SoftwareEngineering #CodeNewbies #LearningEveryday #TechCommunity#CloudComputing#Linux #OpenSource

🧩 Core Git & GitHub Concepts 1. Repository (Repo) A repository is a project folder that Git tracks It contains all your files plus a hidden `.git` folder that stores the project’s history. Example: You start a website project — that folder (`my-website/`) becomes your repo. 💬 Analogy: A repo = a *binder* with all versions of your project inside. --- 2. Commit A commit is like saving a snapshot of your project at a specific point in time. It includes what changed, who made the change, and when. 💻 Command example: ```bash git commit -m "Added navigation bar" ``` 💬 Analogy: A commit = taking a *photo* of your project before making new edits. --- 3. Branch A branch is a separate line of development. You can experiment or add features without affecting the main code. 💻 Example: `main` (or `master`) is your stable branch. You create a new branch for a feature: ```bash git checkout -b feature/login ``` 💬 Analogy: A branch = a *parallel timeline* in your project’s history. --- 4. Merge When your work on a branch is ready, you **merge** it back into the main branch. 💻 **Example:** ```bash git merge feature/login ``` 💬 **Analogy:** Merging = bringing together two timelines into one. --- 5. **Clone** * To **clone** a repo means to make a local copy of it from GitHub (or another source). 💻 **Example:** ```bash git clone https://lnkd.in/dWYs6eXG ``` 💬 **Analogy:** Cloning = downloading the entire project *and its history*. --- 6. **Push** * **Push** = sending your local commits to GitHub (uploading changes). 💻 **Example:** ```bash git push origin main ``` 💬 **Analogy:** Push = “upload my new work to the shared folder.” --- 7. **Pull** * **Pull** = getting the latest changes from GitHub to your local computer. 💻 **Example:** ```bash git pull origin main ``` 💬 **Analogy:** Pull = “download the latest updates others made.” --- 8. **Remote** * A **remote** is the online version of your repo (e.g., on GitHub). 💻 **Example:** ```bash git remote add origin https://lnkd.in/dWYs6eXG ``` 💬 **Analogy:** Remote = the “cloud” version of your binder. --- 9. **Fork** * **Forking** means making your own *copy* of someone else’s GitHub repo so you can modify it freely. 💬 **Analogy:** Fork = “copy someone’s recipe book to try your own variations.” --- 10. **Pull Request (PR)** * A **pull request** is how you ask to merge your changes (from your branch or fork) into another repo. * Used in teamwork and open source projects. 💬 **Analogy:** PR = “Hey, I’ve improved this — can you review and add it to the main project?”

Week 8 : From Git Gaps to Multi-Container Mastery This week brought a humbling realisation: my Git foundation needed serious reinforcement. What I thought I mastered last week revealed critical gaps when faced with real collaborative scenarios. 🔧 Git & Development Environment Breakthroughs: • Mastered reset types: --soft (keeps changes staged) vs --mixed (unstages changes) • Finally understood HEAD~1 and how local history diverges from remote • Successfully integrated VS Code with WSL Ubuntu for seamless development • Solved the VS Code-GitHub connection puzzle: realized I needed to generate new SSH keys after switching my default Git client 💡 The SSH Key Revelation When I configured VS Code as my primary Git client, I hit authentication walls until I discovered that my original WSL-GitHub connection had persisted seamlessly. The solution? Generating a new OpenSSH key specifically for VS Code integration. 🐍 Python Environment Strategy • Chose to apt install python3 directly in WSL rather than official website downloads • Used python3 -m venv venv to create clean, isolated virtual environments • Maintained dependency isolation with requirements.txt for reproducibility • Kept my WSL environment clean by containing projects within their own virtual spaces 🐳 Docker Containerization Milestone The biggest achievement: running a multi-container Flask + MySQL application! After hours of debugging, I discovered the solution that was missing from the tutorial: ( dockerfile RUN apt-get update && apt-get install -y default-libmysqlclient-dev gcc ) This solved the mysqlclient dependency puzzle in slim images and validated my independent troubleshooting skills. 🔑 Key DevOps Mindset Shifts 1. Errors Are Learning Opportunities - Each error message is a puzzle that builds deeper system understanding. 2. Consistency Across Environments - What works locally must work in containers and beyond. 3. Isolation Prevents Chaos - Clean environment separation stops dependency conflicts before they start 4. Tutorials & Production Reality - Real world setups demand deeper solutions than simplified examples 🏆 Proudest Moment: Seeing "Hello, World! MySQL version: 5.7.44" returned from my Flask app communicating across separate containers - proving multi-container networking worked! This week I learned that being good at DevOps isn't about memorizing commands, it's about learning how to figure things out. When something breaks, I now see it as a chance to understand how things really work. That skill is way more valuable than any tool. #DevOps #Docker #Git #VSCode #WSL #Python #Containerization

🚀 Challenge — Git Merge Conflicts Made Easy! 💡 Every developer faces it — that dreaded "merge conflict" message 😅 But don’t worry — it’s not an error, it’s just Git asking you to make the final decision. Here’s how to understand, handle, and master Git merge conflicts 👇 ⚡ What is a Merge Conflict? When Git can’t automatically combine code changes from different branches, it stops and asks you to choose which version to keep. Example scenario: You and your teammate edited the same line in a file. Git doesn’t know which one is correct — that’s a conflict. 🧩 How to Handle Merge Conflicts 1️⃣ Run the merge command: git merge feature/login If conflicts occur, Git will show: CONFLICT (content): Merge conflict in index.js 2️⃣ Open the conflicted file: You’ll see markers like: <<<<<<< HEAD Your code here ======= Teammate’s code here >>>>>>> feature/login 3️⃣ Manually edit the file: Decide which version (or both) to keep — then delete the markers. 4️⃣ Mark the conflict as resolved: git add index.js git commit ✅ Done! Conflict resolved like a pro. 💡 Pro Tips ⭐ Always pull latest changes before merging: git pull origin main ⭐ Use VS Code’s “Source Control” tab — it visually highlights conflicts. ⭐ For complex merges, use: git mergetool 🔥 Key Takeaway Merge conflicts are not scary — they’re communication checkpoints between developers. Handle them with patience and teamwork 🧠 🚀 I’m sharing one practical Git concept daily in my #FullStackDeveloperJourney — from Git → Docker → Linux → MERN → DevOps. Follow to learn hands-on tips that make you a better engineer every day! 💪 #Git #GitHub #VersionControl #MergeConflict #Developers #SoftwareEngineering #FullStackDeveloper #MERNStack #DevOps #CodingJourney

🚀 Master Git Like a Pro: Essential Commands Every Developer Should Know! Whether you're just starting your coding journey or working on production-grade systems, this Git cheat sheet covers the most important commands to boost your productivity and streamline your workflow. Save it, share it, and level up your version control game! 💡 🔥 General Git Tools 🔹 git init → Start a new repository 🔹 git clone <repo> → Download a remote project to your machine 🔹 git status → Check modified, staged & untracked files 🔹 git log → View commit history 🔹 git branch → List all branches 🔹 git checkout <branch> → Switch branches 🔹 git merge <branch> → Merge changes into the current branch 🔹 git stash / git stash pop → Save & restore uncommitted changes 🛠️ Staging & Commit Commands 🔹 git add <file> → Stage a specific file 🔹 git add . → Stage everything 🔹 git commit -m "message" → Save changes with a message 🔹 git push → Upload commits to remote 🔹 git pull → Fetch + merge updates 📊 Info & Debugging 🔹 git diff → View unstaged changes 🔹 git diff --staged → View staged changes 🔹 git show → Display commit details 🔹 git blame <file> → See who changed each line 🔹 git tag → List or create version tags 🌍 Remote Repository Commands 🔹 git remote -v → Show remote URLs 🔹 git remote add origin <url> → Add a remote repo 🔹 git push -u origin <branch> → Push code & set upstream 🔹 git fetch → Download updates without merging 🌱 Branching Commands 🔹 git branch <name> → Create a new branch 🔹 git checkout -b <name> → Create + switch branch 🔹 git switch <branch> → Switch branches 🔹 git branch -d <branch> → Delete a branch 🔹 git merge <branch> → Merge into current branch 🧹 Cleanup & Maintenance 🔹 git clean -f → Remove untracked files 🔹 git gc → Optimize repository 🔹 git fsck → Check repo integrity 🗂 Stash Management 🔹 git stash list → Show all stashes 🔹 git stash apply → Apply a stash safely 🔹 git stash pop → Apply & delete stash 🔹 git stash drop → Remove a stash 🔖 Save this for later. 💬 Comment your favorite Git command. 🔁 Share to help fellow developers master Git more easily. Let’s build smarter, collaborate better, and ship faster! 💙 #Git #GitCommands #GitTutorial #VersionControl #GitHub #Developers  #SoftwareDevelopment #Programming #Coding #DeveloperTools #DevTips #CodeNewbie #GitWorkflow #TechTips #CodingTips #OpenSource #DevCommunity #SoftwareEngineer #WebDevelopment #MobileDevelopment #Flutter #AndroidDev #ReactNative #Kotlin #JavaScript #CleanCode #Debugging #BuildInPublic #TechCommunity #Engineering #100DaysOfCode #Automation #CodeLife #GitForBeginners #TechLearning #ProgrammingLife  #CodeJourney #DeveloperLife #StackOverflow #LearningInPublic  #SoftwareEngineering #CodeTips #GitBasics #DevOps #CloudDevelopers #ProductivityTools #GitMerge #GitPush #GitAdd #CommitYourCode

🔥 𝐇𝐨𝐰 𝐃𝐨𝐞𝐬 𝐆𝐢𝐭 𝐀𝐜𝐭𝐮𝐚𝐥𝐥𝐲 𝐖𝐨𝐫𝐤? Git may look complicated at first, but it works using 4 simple zones that manage your code at different stages. If you understand these 4, you understand Git! 🚀 🔵 𝟏) 𝐖𝐨𝐫𝐤𝐢𝐧𝐠 𝐃𝐢𝐫𝐞𝐜𝐭𝐨𝐫𝐲 Your actual project folder. You create, edit, delete files here. 👉 Changes in the Working Directory are NOT tracked until you stage them. 🟡 𝟐) 𝐒𝐭𝐚𝐠𝐢𝐧𝐠 𝐀𝐫𝐞𝐚 (𝐈𝐧𝐝𝐞𝐱) A temporary holding area where you collect changes for the next snapshot. ✔️ 𝐠𝐢𝐭 𝐚𝐝𝐝 → moves changes from Working Directory ➝ Staging Area You control exactly what goes into your next commit. 🟢 𝟑) 𝐋𝐨𝐜𝐚𝐥 𝐑𝐞𝐩𝐨𝐬𝐢𝐭𝐨𝐫𝐲 (.𝐠𝐢𝐭 𝐟𝐨𝐥𝐝𝐞𝐫) Your project’s full history — commits, tags, branches — stored locally. ✔️ 𝐠𝐢𝐭 𝐜𝐨𝐦𝐦𝐢𝐭 → saves the staged changes as a permanent snapshot in the Local Repo. This is your local, safe backup of everything you’ve done. 🟠 𝟒) 𝐑𝐞𝐦𝐨𝐭𝐞 𝐑𝐞𝐩𝐨𝐬𝐢𝐭𝐨𝐫𝐲 (𝐆𝐢𝐭𝐇𝐮𝐛, 𝐁𝐢𝐭𝐛𝐮𝐜𝐤𝐞𝐭, 𝐀𝐳𝐮𝐫𝐞 𝐑𝐞𝐩𝐨𝐬) A shared cloud copy used for collaboration with your team. ✔️ 𝐠𝐢𝐭 𝐩𝐮𝐬𝐡 → sends commits from Local Repo ➝ Remote Repo 🔄 How Other Git Commands Fit In 🔸 𝐠𝐢𝐭 𝐟𝐞𝐭𝐜𝐡 → Downloads new changes from remote → local without merging. 🔸 𝐠𝐢𝐭 𝐦𝐞𝐫𝐠𝐞 → Combines another branch into your current branch. 🔸 𝐠𝐢𝐭 𝐩𝐮𝐥𝐥 → git fetch + git merge — Gets the latest changes AND applies them. 🔸 𝐠𝐢𝐭 𝐜𝐥𝐨𝐧𝐞 → Copies a remote repo to your machine — creates Working Dir + Local Repo. 🔸 𝐠𝐢𝐭 𝐜𝐡𝐞𝐜𝐤𝐨𝐮𝐭 → Switches to another branch/commit. Moves your HEAD pointer. 🔸 𝐠𝐢𝐭 𝐝𝐢𝐟𝐟 → Shows differences between: working directory ↔ staging area staging area ↔ last commit commits ↔ commits Super useful for reviewing changes before committing. 🚀 𝐅𝐢𝐧𝐚𝐥 𝐓𝐡𝐨𝐮𝐠𝐡𝐭𝐬 Git becomes easy once you understand how changes travel through: 𝐖𝐨𝐫𝐤𝐢𝐧𝐠 𝐃𝐢𝐫𝐞𝐜𝐭𝐨𝐫𝐲 → 𝐒𝐭𝐚𝐠𝐢𝐧𝐠 𝐀𝐫𝐞𝐚 → 𝐋𝐨𝐜𝐚𝐥 𝐑𝐞𝐩𝐨 → 𝐑𝐞𝐦𝐨𝐭𝐞 𝐑𝐞𝐩𝐨 Master this flow and Git will feel effortless! #Git #GitHub #Programming #VersionControl #DevOps #Developers #SoftwareEngineering #Coding #BackendDeveloper #FrontendDeveloper #DotNet #DotNetDeveloper #Java #JavaDeveloper #WebDevelopment #TechCommunity #SoftwareDeveloper #EngineeringCommunity

𝗚𝗶𝘁 𝗰𝗵𝗮𝗻𝗴𝗲𝗱 𝘁𝗵𝗲 𝗴𝗮𝗺𝗲! 96% of developers use Git. Let’s talk about how Git went from just another tool -> to the tool that every developer relies on today. Git was born in 2005, created by none other than Linus Torvalds, the same legend behind the Linux kernel. Story goes: The Linux team lost access to their old version control system. So Linus said, “Fine, I’ll build one.” And just like that, Git was born. He built it for Linux kernel developers, people working on one of the most complex, fast-moving codebases in the world. That meant it had to be fast, distributed, and built for chaos. From day one, Git could handle repositories with tens of millions of lines of code. Speed and performance weren’t afterthoughts, they were core design goals. 𝗦𝗼, 𝘄𝗵𝗮𝘁 𝗶𝘀 𝗚𝗶𝘁 𝗿𝗲𝗮𝗹𝗹𝘆? Git is an open-source, distributed version control system that manages versions of code (and even data). But here’s the thing, Git doesn’t just track files line by line like a simple document tracker. It’s way smarter than that. Git tracks snapshots.  Every time you commit, Git takes a snapshot of your entire project’s state, efficiently storing only what’s changed. Under the hood, it’s powered by a key-value store using SHA-1 hashes. Every commit points to a full snapshot of your repo, not just the changes. Those long hashes you see? They uniquely represent your content, no two different files share the same one. Everything in Git is stored as an object: - Blobs for file contents - Trees for directories - Commits for snapshots of your files and meta data And here’s the wild part Git is content-addressed, not file-name-based. That means Git doesn’t care what the file is called, only what’s inside. If the content changes -> the hash changes. If the content’s the same -> Git reuses it. That’s why Git is insanely efficient, even when versioning huge config repos like Terraform, Kubernetes manifests, or Helm charts. Today, if you’re doing anything in DevOps, cloud, or code, Git is probably at the center of it. So yeah, Git didn’t just change the game. The smart, compressed, hash-based snapshot engine became the game! #DevOps #Automation #Git #Linux #Scripting #CloudEngineering #Infrastructure #CoderCo

🚀 𝐓𝐡𝐞𝐬𝐞 𝐆𝐢𝐭 𝐓𝐫𝐢𝐜𝐤𝐬 𝐒𝐚𝐯𝐞𝐝 𝐌𝐞 𝐅𝐫𝐨𝐦 𝐋𝐨𝐬𝐢𝐧𝐠 𝟑 𝐃𝐚𝐲𝐬 𝐨𝐟 𝐖𝐨𝐫𝐤 — 𝐍𝐨 𝐓𝐮𝐭𝐨𝐫𝐢𝐚𝐥 𝐓𝐞𝐥𝐥𝐬 𝐘𝐨𝐮 𝐓𝐡𝐢𝐬. (Real Issues • Real Fixes • Real Industry Knowledge) Everyone knows git add → git commit → git push. But nobody talks about the nightmare real-world problems that happen in teams — and the Git tricks seniors use to fix them in seconds. Here are the battle-tested Git lessons you only learn after 💥 breaking production, 💥 losing commits, 💥 messing up merges, 💥 and recovering at 2 AM. Save this — these WILL save your job one day. 👇 🧠 1️⃣ “Lost All My Work By Accident” → Recover With Reflog Problem: You reset, hard deleted, or switched branches… and your entire work vanished. Secret Senior Solution: git reflog This shows every movement of HEAD. You can recover commits you thought were dead forever. Real-World Tip: Reflog is your time machine. Every senior dev uses it. Juniors don’t even know it exists. 🔄 2️⃣ “My Branch Is 200 Commits Behind” → Fix With Rebase Problem: Your feature branch diverged from main, causing massive merge conflicts. Secret Senior Move: git pull --rebase Brings your commits ON TOP of latest main. Why Seniors Use It: Cleaner history Fewer conflicts Looks like work was done after main’s changes ⚡ 3️⃣ “Merged Wrong Code Into Main” → Undo Without Breaking History Problem: You merged a bad PR into main. Solution Seniors Use: git revert <commit-id> Creates a new commit that undoes the wrong merge. Never use: ❌ git reset --hard on main → you’ll destroy the team’s history. 🎭 4️⃣ “Someone Broke the App… Who Did It?” → Use Git Blame Problem: A bug suddenly appears in production. Secret Senior Tool: git blame <file> Tells you EXACTLY: who wrote that line, when, and in which commit. This saves HOURS of debugging. 🔍 5️⃣ “A Bug Exists, But I Don’t Know Which Commit Added It” → Bisect This is the secret tool seniors SWEAR by. Command: git bisect start git bisect bad git bisect good <old-commit> Git automatically finds the exact commit where the bug was introduced. Massive time saver. 🗃️ 6️⃣ “I Want To Experiment Without Risk” → Stash Like a Pro Problem: You need to switch branches urgently, but your current changes are half-done. Senior Fix: git stash push -m "wip-login-feature" Saves your work safely. Later: git stash apply or git stash pop Pro Secret: Keep your stashes named and organized. Juniors use stash blindly and lose work. 🧨 7️⃣ “Need To Bring Only One Commit From Another Branch” → Cherry-pick Instead of merging a whole branch, do: git cherry-pick <commit-id> When seniors want just one fix, not the whole branch — this is the trick. 🧩 8️⃣ I Pushed to Wrong Branch!” → Safe Reset Do NOT do: git reset --hard on shared branches. Instead: git revert or git reset --soft (keeps your changes staged so you don’t lose work) Follow me Mazharuddin Farooque for more real-world developer insights and senior-level engineering secrets.

🚀 Master #Git with My Cheatsheet! 😉 Whether you’re a beginner or an experienced developer, this #Git #Cheatsheet for #Software #Engineers will help you boost productivity and stay organized! 💻 🧩 Basic Commands 1. git init – #Initializes a new Git repository. 2. git clone <repository> – #Clones a repository. 3. git status – Shows the status of changes in the working directory. 💾 Staging and Committing 1. git add <file> – Adds a file to the staging area. 2. git add . – Adds all changes to the staging area. 3. git commit -m "Message" – Commits the staged changes. 🌿 Branching 1. git branch – #Lists branches. 2. git branch <name> – Creates a new branch. 3. git checkout <branch> – #Switches to a specific branch. 4. git checkout -b <branch> – #Creates and #switches to a new branch. 🔄 Pull and Push 1. git pull <remote> <branch> – #Pulls changes from a remote repository. 2. git push <remote> <branch> – #Pushes changes to a remote repository. 🔁 Merging and Rebasing 1. git merge <branch> – #Merges a branch into the current branch. 2. git rebase <branch> – #Rebases the current branch onto another branch. 📜 Logs and Difference 1. git log – Shows a #log of commits. 2. git diff <file> – Shows file changes compared to the last commit. ⚙️ Advanced 1. git stash – #Stashes changes in the working directory. 2. git cherry-pick <commit> – Applies changes from a specific #commit. 3. git bisect – Helps find which commit introduced a #bug. 🧨 Undoing Changes 1. git reset --hard HEAD~1 – #Resets the repository to the previous commit. 2. git revert <commit> – #Reverts a specific commit. 🌐 Remote Repositories 1. git remote -v – #Lists remote repositories. 2. git remote add <name> <url> – #Adds a new remote repository. 💡 Keep this handy — it’s your quick reference for daily Git operations! #SoftwareDevelopment #TechTips #CodingLife #GitCommands #CodeNewbie #DeveloperTools #DevOps #TechLearning #GitWorkflow #ProgrammingTips #Git #GitCheatsheet #SoftwareEngineering #Programming #Developers #VersionControl #GitHub #Coding

✅ *Git & GitHub Interview Questions & Answers* 🧑💻🌐 *1️⃣ What is Git?* *A:* Git is a distributed version control system to track changes in source code during development. *2️⃣ What is GitHub?* *A:* GitHub is a cloud-based platform that hosts Git repositories and supports collaboration, issue tracking, and CI/CD. *3️⃣ Git vs GitHub* - *Git:* Version control tool (local) - *GitHub:* Hosting service for Git repositories (cloud-based) *4️⃣ What is a Repository (Repo)?* *A:* A storage space where your project’s files and history are saved. *5️⃣ Common Git Commands:* - `git init` → Initialize a repo - `git clone` → Copy a repo - `git add` → Stage changes - `git commit` → Save changes - `git push` → Upload to remote - `git pull` → Fetch and merge from remote - `git status` → Check current state - `git log` → View commit history *6️⃣ What is a Commit?* *A:* A snapshot of your changes. Each commit has a unique ID (hash) and message. *7️⃣ What is a Branch?* *A:* A separate line of development. The default branch is usually `main` or `master`. *8️⃣ What is Merging?* *A:* Combining changes from one branch into another. *9️⃣ What is a Pull Request (PR)?* *A:* A GitHub feature to propose changes, request reviews, and merge code into the main branch. *🔟 What is Forking?* *A:* Creating a personal copy of someone else’s repo to make changes independently. *1️⃣1️⃣ What is .gitignore?* *A:* A file that tells Git which files/folders to ignore (e.g., logs, temp files, env variables). *1️⃣2️⃣ What is Staging Area?* *A:* A space where changes are held before committing. *1️⃣3️⃣ Difference between Merge and Rebase* - *Merge:* Keeps all history, creates a merge commit - *Rebase:* Rewrites history, makes it linear *1️⃣4️⃣ What is Git Workflow?* *A:* A set of rules like Git Flow, GitHub Flow, etc., for how teams manage branches and releases. *1️⃣5️⃣ How to Resolve Merge Conflicts?* *A:* Manually edit the conflicted files, mark resolved, then commit the changes.