Complete Guide to Applying Git Stash Changes to a New Branch

Fundamental Concepts of Git Stash

During software development, developers often need to switch between different tasks without committing incomplete work. Git provides the git stash command to address this issue, which temporarily stores modifications in the working directory and restores the workspace to a clean state.

Standard Operational Procedure

According to best practices, the standard procedure for applying stashed changes to a new branch is as follows:

First, the developer has made modifications on the main branch:

# Make code modifications in working directory
echo "New feature code" >> feature.py
git add feature.py

Then use the git stash command to save these changes:

git stash save "New feature in progress"

At this point, the working directory returns to a clean state, allowing switching to other branches. When needing to continue previous work on a new branch, execute the following steps:

Creating New Branch and Applying Stash

Create a new branch from current HEAD:

git branch new-feature-branch HEAD

Switch to the newly created branch:

git checkout new-feature-branch

Apply previously stashed changes:

git stash pop

Simplified Command Combination

Git provides more concise command combinations to achieve the same functionality:

# Simplified three-step operation
git stash                    # Stash current changes
git checkout -b new-branch   # Create and switch to new branch
git stash pop               # Apply stashed changes

The advantage of this method lies in more concise commands while automatically handling branch creation and switching.

Dedicated Command: git stash branch

Git also provides a specialized command for this scenario:

git stash branch branch-name

This command will:

• Create a new branch based on the commit when stash was created
• Automatically switch to the new branch
• Apply stashed changes to working directory
• Automatically drop the stash if application is successful

Technical Details Analysis

git stash actually saves working directory modifications to a special storage area. When executing git stash pop, Git will:

# Simulate internal process of git stash pop
def simulate_stash_pop():
    apply_stash_changes()    # Apply stashed modifications
    if apply_successful:     # If application successful
        drop_stash_entry()   # Drop stash entry

This method is particularly suitable for the following scenarios:

• Temporarily switching to urgent bug fixes
• Experimenting with different implementation approaches
• Maintaining cleanliness of main branch

Conflict Resolution

When applying stash on a new branch, conflict situations may occur. Git will:

# If conflicts occur
git stash pop
# Output: CONFLICT (content): Merge conflict in file.py

Manual conflict resolution is required at this point, followed by committing the modifications.

Best Practice Recommendations

Based on practical development experience, the following best practices are recommended:

• Add descriptive messages to stashes for easy identification
• Regularly clean up unnecessary stashes
• Ensure target branch is in correct state before applying stash
• Use git stash list to view all stashes

By mastering these techniques, developers can more efficiently manage unfinished work and enhance development workflow flexibility.