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

by

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

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

More Related Contents:

  1. How to remove local (untracked) files from the current Git working tree
  2. Make an existing Git branch track a remote branch?
  3. How to get the current branch name in Git?
  4. What exactly do we mean by “branch”?
  5. Can I recover a branch after its deletion in Git?
  6. In git, is there a simple way of introducing an unrelated branch to a repository?
  7. Track all remote git branches as local branches
  8. Finding a branch point with Git?
  9. Find out which remote branch a local branch is tracking
  10. Why do I have to “git push –set-upstream origin “?
  11. Set up git to pull and push all branches
  12. How is a tag different from a branch in Git? Which should I use, here?
  13. Branch descriptions in Git
  14. git – how to get default branch?
  15. How do I create a remote Git branch?
  16. What are some examples of commonly used practices for naming git branches? [closed]
  17. git shallow clone (clone –depth) misses remote branches
  18. Creating a new empty branch for a new project
  19. git: Switch branch and ignore any changes without committing
  20. Git: Merge to master while automatically choosing to overwrite master files with branch
  21. Git undo local branch delete
  22. Branching: different config files for release/development
  23. Switch branch and ignore any changes without committing
  24. `git fetch` a remote branch
  25. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  26. How do I create a new Git branch from an old commit? [duplicate]
  27. In git, how do I remove a commit from one branch and apply it to a different branch?
  28. How do I run git log to see changes only for a specific branch?
  29. git push error: src refspec main does not match any on linux
  30. git branch permissions

Leave a Comment