使用git，如何将一些未提交的更改从一个分支移动到另一个文件夹中的另一个分支？

Question

I have two different branches of the same software that I work on every day. However, every time I checkout the other branch, my build process can take up to an hour. To solve this, I have just checked out the project once for each branch in two separate folders.

I did some work in one branch, and realized before committing it that I was in the wrong folder, and thus the wrong branch. How can I move the work I did on this branch, to the other branch, preferably without creating a commit (if that is even possible)?

Answer 1

In the directory with the changes, do:

$ git diff > patch

cd to the other directory, and do:

git apply /path/to/patch

Answer 2

Well, you can also not build the other branch..

1. Make the change, don't commit
2. Switch to the other branch
3. Commit (don't build)
4. Come back

Naturally, this only works if you can allow yourself to commit without building (reasonable in some scenarios).