如何将本地未提交的更改合并到另一个 Git 分支？

Question

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?

Answer 1

Since your files are not yet committed in branch1 :

git stash
git checkout branch2
git stash pop

or

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

---

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

Answer 2

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

Answer 3

A shorter alternative to the previously mentioned stash approach would be:

Temporarily move the changes to a stash.

1. git stash

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

2. git stash branch new_branch_name

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

Answer 4

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:

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

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

1. cd my-project-master which is another WD sharing the same .git
2. git reflog to find the bugfix I've just made.
3. 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:

1. cd my-project which is the main WD I'm working on.
2. 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.

Answer 5

如果它是关于承诺的更改，你应该看看git-rebase，但正如VonC在评论中指出的那样，当你谈论本地更改时，git-stash肯定是这样做的好方法。

Answer 6

The answers given so far are not ideal because they require a lot of needless work resolving merge conflicts, or they make too many assumptions which are frequently false. This is how to do it perfectly. The link is to my own site.

How to Commit to a Different Branch in git

You have uncommited changes on my_branch that you want to commit to master , without committing all the changes from my_branch .

Example

git merge master
git stash -u
git checkout master
git stash apply
git reset
git add example.js
git commit
git checkout .
git clean -f -d
git checkout my_branch
git merge master
git stash pop

Explanation

Start by merging master into your branch, since you'll have to do that eventually anyway, and now is the best time to resolve any conflicts.

The -u option (aka --include-untracked ) in git stash -u prevents you from losing untracked files when you later do git clean -f -d within master .

After git checkout master it is important that you do NOT git stash pop , because you will need this stash later. If you pop the stash created in my_branch and then do git stash in master , you will cause needless merge conflicts when you later apply that stash in my_branch .

git reset unstages everything resulting from git stash apply . For example, files that have been modified in the stash but do not exist in master get staged as "deleted by us" conflicts.

git checkout . and git clean -f -d discard everything that isn't committed: all changes to tracked files, and all untracked files and directories. They are already saved in the stash and if left in master would cause needless merge conflicts when switching back to my_branch .

The last git stash pop will be based on the original my_branch , and so will not cause any merge conflicts. However, if your stash contains untracked files which you have committed to master, git will complain that it "Could not restore untracked files from stash". To resolve this conflict, delete those files from your working tree, then git stash pop , git add . , and git reset .

Answer 7

• First, Create a new branch
• Second, add your changes
• And lastly, commit to your changes with a beautiful message

git checkout -b branch_name
git add file_one_name file_two_name file_three_name
git commit -m commit_message

Answer 8

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.