Git

How to Create a Branch From Stash?

While working on Git, developers stash some of their project’s changes. They may face a problem when they leave those changes for a while and make changes on the same branch again. The merge conflicts can occur and you may face problems in reapplying the stashed changes to the current branch. In this situation, creating a new branch from the stash changes is the best option.

This study will explain:

How to Create/Make a New Branch From the Latest Stash?

To create a new branch from the latest stash:

  • First, view the latest stash changes.
  • Then, run the β€œgit stash branch <branch-name>” command to create a branch from the latest stash and apply its changes to it.
  • Lastly, verify the newly created branch.

Step 1: View Available Stashes

First, type out the following command to display the list of available stashes in the repository:

$ git stash list

It can be seen that the repository contains three stashes:

Step 2: View Latest Stash Changes

Then, view the latest stash changes with the help of given-provided command:

$ git stash show

According to the below output the latest stash contains only one β€œnew.txt” file’s changes:

Step 3: Create New Branch From Latest Stash

Now, execute the β€œgit stash branch” command along with the desired branch name to create it. Here, β€œalpha” is our new branch name:

$ git stash branch alpha

The below screenshot indicates that the β€œalpha” branch has been created from the latest stash with all changes:

Step 4: Verify Branch

Finally, verify whether the new branch has been created or not by viewing all branches:

$ git branch

The below output displays the newly created β€œalpha” branch:

How to Create/Make a New Branch From an Earlier Stash?

To create a new branch from the earlier stash, utilize the β€œgit stash branch <branch-name> stash@{reference-no}” command and specify the branch name and reference.

Step 1: Navigate to the β€œmaster” Branch

First, move to the β€œmaster” branch:

$ git switch master

Step 2: List Available Stashes

Then, display the list of all stashes in the repository and choose the desired stash reference:

$ git stash list

According to the below image, the current repository contains two stashes:

Step 3: Create New Branch From Earlier Stash

Utilize the β€œgit stash branch” command and specify the new branch name and the stash reference to create a new branch from it. For instance, we have specified the β€œstash@{1}” stash reference to create a β€œfeature” branch:

$ git stash branch feature stash@{1}

In the below output, it can be observed that the new β€œfeature” branch has been created successfully including all its changes:

Step 4: Verify Branch

Finally, view all available branches to ensure whether the new branch has been created or not:

$ git branch

That’s all about creating a new branch from the stash in Git.

Conclusion

Git permits developers to create a new branch from stash. The β€œgit stash branch <branch-name>” command is utilized to create a branch from the latest stash. Moreover, users can create a new branch from an earlier stash using the β€œgit stash branch <branch-name> stash@{reference-no}” command. This study explained the methods to create or make a branch from a stash.

About the author

Laiba Younas

I have done bachelors in Computer Science. Being passionate about learning new technologies, I am interested in exploring different programming languages and sharing my experience with the world.