How do I merge my local uncommitted changes into another Git branch?

Git Problem Overview

How can I do the following in Git?

My current branch is branch1 and I have made some local changes. However, I now realize that I actually meant to be applying these changes to branch2. Is there a way to apply/merge these changes so that they become local changes on branch2 without committing them on branch1?

Git Solutions

Solution 1 - Git

Since your files are not yet committed in branch1:

git stash
git checkout branch2
git stash pop

git stash
git checkout branch2
git stash list       # to check the various stash made in different branch
git stash apply x    # to select the right one

Above is the longer more explicit version of rbento's answer:

git stash
git stash branch branch2

It uses:

> ## git stash branch <branchname> [<stash>] > > - Creates and checks out a new branch named <branchname> starting from the commit at which the <stash> was originally created, > - applies the changes recorded in <stash> to the new working tree and index. > > If that succeeds, and <stash> is a reference of the form stash@{<revision>}, it then drops the <stash>. > > This is useful if the branch on which you ran git stash push has changed enough that git stash apply fails due to conflicts.
Since the stash entry is applied on top of the commit that was HEAD at the time git stash was run, it restores the originally stashed state with no conflicts.

As commented by benjohn (see git stash man page):

> To also stash currently untracked (newly added) files, add the argument -u, so:

git stash -u

Solution 2 - Git

Stashing, temporary commits and rebasing may all be overkill. If you haven't added the changed files to the index, yet, then you may be able to just checkout the other branch.

git checkout branch2

This will work so long as no files that you are editing are different between branch1 and branch2. It will leave you on branch2 with you working changes preserved. If they are different then you can specify that you want to merge your local changes with the changes introduced by switching branches with the -m option to checkout.

git checkout -m branch2

If you've added changes to the index then you'll want to undo these changes with a reset first. (This will preserve your working copy, it will just remove the staged changes.)

git reset

Solution 3 - Git

A shorter alternative to the accepted answer would be:

> Temporarily move the changes to a stash.

git stash

> Create and switch to a new branch and then pop the stash to it in just one step.

git stash branch new_branch_name

Then just add and commit the changes to this new branch.

Solution 4 - Git

WARNING: Not for git newbies.

This comes up enough in my workflow that I've almost tried to write a new git command for it. The usual git stash flow is the way to go but is a little awkward. I usually make a new commit first since if I have been looking at the changes, all the information is fresh in my mind and it's better to just start git commit-ing what I found (usually a bugfix belonging on master that I discover while working on a feature branch) right away.

> It is also helpful—if you run into situations like this a lot—to have another working directory alongside your current one that always have the master branch checked out.

So how I achieve this goes like this:

git commit the changes right away with a good commit message.
git reset HEAD~1 to undo the commit from current branch.
(optional) continue working on the feature.

Sometimes later (asynchronously), or immediately in another terminal window:

cd my-project-master which is another WD sharing the same .git
git reflog to find the bugfix I've just made.
git cherry-pick SHA1 of the commit.

Optionally (still asynchronous) you can then rebase (or merge) your feature branch to get the bugfix, usually when you are about to submit a PR and have cleaned your feature branch and WD already:

cd my-project which is the main WD I'm working on.
git rebase master to get the bugfixes.

This way I can keep working on the feature uninterrupted and not have to worry about git stash-ing anything or having to clean my WD before a git checkout (and then having the check the feature branch backout again.) and still have all my bugfixes goes to master instead of hidden in my feature branch.

IMO git stash and git checkout is a real PIA when you are in the middle of working on some big feature.

Solution 5 - Git

If it were about committed changes, you should have a look at git-rebase, but as pointed out in comment by VonC, as you're talking about local changes, git-stash would certainly be the good way to do this.

Solution 6 - Git

These are the steps I follow:

git clone {link}
cd {repo folder}

You can check the status and which branch you are on using:

git status
git branch
git branch -a

Note: Here if you make changes in your local repo before moving to the new branch, the following steps should still work.

If "git branch" shows master, and you want to create+move to another branch:

git checkout -b {branch name}

Check branch again using "git branch" It should now show that you are in the new branch.

Now add, commit and push:

git add .
git commit -m "added new branch"
git push origin {branch name}

The above steps work for me in both the situation when I have made changes before moving to the new local branch or making changes after moving to the new branch. I hope it helps people running into similar situations.

Content Type	Original Author	Original Content on Stackoverflow
Question	solsberg	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	CB Bailey	View Answer on Stackoverflow
Solution 3 - Git	rbento	View Answer on Stackoverflow
Solution 4 - Git	chakrit	View Answer on Stackoverflow
Solution 5 - Git	claf	View Answer on Stackoverflow
Solution 6 - Git	Singh	View Answer on Stackoverflow