git stash -> merge stashed change with current changes

user_1467365 0
Viewed 180576

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.

git-stash git-merge git
9 Answers

The way I do this is to git add this first then git stash apply <stash code>. It's the most simple way.

user_38564370

you can easily

  1. Commit your current changes
  2. Unstash your stash and resolve conflicts
  3. Commit changes from stash
  4. Soft reset to commit you are comming from (last correct commit)
user_36903410

May be, it is not the very worst idea to merge (via difftool) from ... yes ... a branch! 

> current_branch=$(git status | head -n1 | cut -d' ' -f3)
> stash_branch="$current_branch-stash-$(date +%yy%mm%dd-%Hh%M)"
> git stash branch $stash_branch
> git checkout $current_branch
> git difftool $stash_branch
user_29408810

I found another solution. You can commit your current open changes, then pop your stash, and then soft reset to before the last commit.

git commit -am 'Open changes'
git stash pop
git reset --soft HEAD~1
user_10618420
Related