docs(git): add comprehensive guide on git stash

New tutorial covering stash basics, commands, techniques, and best practices.

Author: mahatmamahardhikach

tutorial/vcs/git_stash.md

@@ -0,0 +1,158 @@
+---
+title: Mastering Git Stash
+layout: default
+parent: Git
+grand_parent: Version Control System
+description: "Mastering Git Stash"
+---
+
+# Mastering Git Stash: A Comprehensive Guide
+
+## Table of Contents
+
+- [Introduction to Git Stash](#introduction-to-git-stash)
+- [What is Git Stash?](#what-is-git-stash)
+- [Basic Git Stash Commands](#basic-git-stash-commands)
+- [Advanced Git Stash Techniques](#advanced-git-stash-techniques)
+- [Real-World Use Cases](#real-world-use-cases)
+- [Best Practices](#best-practices)
+- [Common Pitfalls and Solutions](#common-pitfalls-and-solutions)
+
+## Introduction to Git Stash
+
+Git stash is a powerful feature that allows developers to temporarily shelve changes they're not ready to commit. It's
+like a magical clipboard for your code modifications, enabling you to switch contexts quickly without losing your
+work-in-progress.
+
+## What is Git Stash?
+
+Git stash is essentially a temporary storage mechanism that lets you:
+
+- Save current changes without committing them
+- Clean your working directory
+- Switch branches or work on different tasks
+- Retrieve your saved changes later
+
+Think of it as a quick way to "park" your current modifications without creating an incomplete or messy commit.
+
+### How Git Stash Works Internally
+
+When you use `git stash`, Git:
+
+- Creates a temporary commit in your local Git history
+- Reverts your working directory to the last committed state
+- Stores the changes in a stack-like structure
+- Allows you to retrieve these changes later
+
+## Basic Git Stash Commands
+
+### Stashing Changes
+
+```bash
+# Basic stash command
+git stash
+
+# Stash with a descriptive message
+git stash save "Work in progress: feature X"
+
+# Stash including untracked files
+git stash -u
+```
+
+### Retrieving Stashed Changes
+
+```bash
+# Apply the most recent stash
+git stash apply
+
+# Pop the most recent stash (apply and remove)
+git stash pop
+
+# Apply a specific stash
+git stash apply stash@{2}
+```
+
+### Managing Stash List
+
+```bash
+# List all stashes
+git stash list
+
+# Show contents of a specific stash
+git stash show stash@{1}
+
+# Delete a specific stash
+git stash drop stash@{1}
+
+# Clear all stashes
+git stash clear
+```
+
+## Advanced Git Stash Techniques
+
+### Partial Stashing
+
+```bash
+# Interactively choose which changes to stash
+git stash save -p "Partial stash"
+```
+
+### Stashing Selected Files
+
+```bash
+# Stash only specific files
+git stash push path/to/file1 path/to/file2
+```
+
+## Real-World Use Cases
+
+### Scenario 1: Unexpected Urgent Task
+
+Imagine you're working on a feature branch and suddenly need to fix a critical bug on the main branch:
+
+1. Your current branch has uncommitted changes
+2. You can't commit these half-finished changes
+3. Use `git stash` to save your work
+4. Switch to main branch
+5. Fix the urgent bug
+6. Return to your feature branch
+7. Use `git stash pop` to continue your work
+
+### Scenario 2: Collaborative Development
+
+During pair programming or team collaboration:
+
+- Quickly save experimental changes
+- Share your stashed work with teammates
+- Retrieve work across different development environments
+
+## Best Practices
+
+- Use descriptive messages when stashing
+- Regularly review and clean up your stash list
+- Don't use stash as a long-term code storage mechanism
+- Remember that stashes are local to your repository
+
+## Common Pitfalls and Solutions
+
+### Stash Conflicts
+
+When applying a stash, you might encounter merge conflicts. Resolve these manually by:
+
+- Examining the conflict markers
+- Editing the files to reconcile differences
+- Adding the resolved files
+- Continuing the stash application
+
+### Large Stash Accumulation
+
+Prevent stash clutter by:
+
+- Regularly applying or dropping stashes
+- Using meaningful stash messages
+- Implementing a personal stash management routine
+
+## Conclusion
+
+Git stash is a versatile tool that offers developers flexibility and efficiency in managing code changes. By
+understanding its nuances, you can significantly improve your workflow and coding productivity.