git stash - merge stashed change with current changes

Question

I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch   What I want is a way to merge my stashed changes with the current changes     Is there a way to do this   Its more for convenience  I eventually gave up and committed first my current changes  then my stashed changes  but I would have preferred to get them in with one fell swoop

User · Answer

you can easily   Commit your current changes Unstash your stash and resolve conflicts Commit changes from stash Soft reset to commit you are comming from  last correct commit

User · Answer

What I want is a way to merge my stashed changes with the current   changes   Here is another option to do it   git stash show -p git apply git stash drop   git stash show -p will show the patch of last saved stash  git apply will apply it  After the merge is done  merged stash can be dropped with git stash drop

User · Answer

As suggested by  Brandan  here s what I needed to do to get around  error  Your local changes to the following files would be overwritten by merge         file txt Please  commit your changes or stash them before you can merge  Aborting   Follow this process   git status    local changes to  file  git stash list    further changes to  file  we want to merge git commit -m  WIP  file git stash pop git commit -m  WIP2  file git rebase -i HEAD      I always use interactive rebase -- I m sure you could do this in a single command with the simplicity of this process -- basically squash HEAD into HEAD    mark the second commit to squash into the first using your EDITOR git reset HEAD    And you ll be  left with fully merged local changes to file  ready to do further work cleanup or make a single good commit  Or  if you know the merged contents of file will be correct  you could write a fitting message and skip git reset HEAD

User · Answer

The way I do this is to git add this first then git stash apply  lt stash code gt   It s the most simple way

User · Answer

May be  it is not the very worst idea to merge  via difftool  from     yes     a branch     gt  current branch   git status   head -n1   cut -d    -f3   gt  stash branch   current branch-stash-  date   yy mm dd- Hh M    gt  git stash branch  stash branch  gt  git checkout  current branch  gt  git difftool  stash branch

User · Answer

Running git stash pop or git stash apply is essentially a merge  You shouldn t have needed to commit your current changes unless the files changed in the stash are also changed in the working copy  in which case you would ve seen this error message   error  Your local changes to the following files would be overwritten by merge         file txt Please  commit your changes or stash them before you can merge  Aborting   In that case  you can t apply the stash to your current changes in one step  You can commit the changes  apply the stash  commit again  and squash those two commits using git rebase if you really don t want two commits  but that may be more trouble that it s worth

User · Answer

Another option is to do another  git stash  of the local uncommitted changes  then combine the two git stashes   Unfortunately git seems to not have a way to easily combine two stashes   So one option is to create two  diff files and apply them both--at lest its not an extra commit and doesn t involve a ten step process     how to  https   stackoverflow com a 9658688 32453

User · Answer

tl dr Run git add first   I just discovered that if your uncommitted changes are added to the index  i e   quot staged quot   using git add       then git stash apply  and  presumably  git stash pop  will actually do a proper merge  If there are no conflicts  you re golden   If not  resolve them as usual with git mergetool  or manually with an editor  To be clear  this is the process I m talking about  mkdir test-repo  amp  amp  cd test-repo  amp  amp  git init echo test  gt  test txt git add test txt  amp  amp  git commit -m  quot Initial version quot     here s the interesting part     make a local change and stash it  echo test2  gt  test txt git stash    make a different local change  echo test3  gt  test txt    try to apply the previous changes  git stash apply   git complains  quot Cannot apply to a dirty working tree  please stage your changes quot     add  quot test3 quot  changes to the index  then re-try the stash  git add test txt git stash apply   git says   quot Auto-merging test txt quot    git says   quot CONFLICT  content   Merge conflict in test txt quot       which is probably what you re looking for

[git] git stash -> merge stashed change with current changes

Examples related to git

Examples related to git-merge

Examples related to git-stash