git stash apply to specific files?

Question

I have two stashes that overlap. I think that if I apply both stashes, I will have a mess, because I don't need some changes in one of the stashes. So I would like to apply one stash and then apply only changes to specific files from another stash, even better if interactively. How can I do it?

My question is different than this one suggested, because the OP of that question wants apply stash to different commits, I want to apply two stashes to my code.

Possible duplicate of How can I apply only some of a git stash? — Francesco
– Francesco, Commented Apr 20, 2016 at 13:53
Possible duplicate of Git: how to use stash -p to stash specific files? — Nemo
– Nemo, Commented May 16, 2018 at 20:53

bnord · Accepted Answer · 2016-04-20 13:54:46Z

2

Apply one stash, reset the files you don't want, commit the others, apply the second stash, reset the files from the first, commit.

answered Apr 20, 2016 at 13:54

bnord

3951 silver badge12 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

rightaway717 Over a year ago

The problem is that I have changes in both stashes to some same files, and I want them both, but they are conflicting. I don't mean that I want changes to only specific files from specific stash

bnord Over a year ago

Apply the first, commit, apply the second (you will need to specify the stash), you will get a merge conflict if there are conflicting edits just like when merging, clean up the conflicts, commit.

Collectives™ on Stack Overflow

git stash apply to specific files?

1 Answer 1

2 Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Linked

Related