Unable to "git stash pop" due to conflict

--------------------------------------------------
Rise to the top 3% as a developer or hire one of them at Toptal: https://topt.al/25cXVn
--------------------------------------------------

Music by Eric Matyas
https://www.soundimage.org
Track title: Puzzle Game Looping

--

Chapters
00:00 Unable To &Quot;Git Stash Pop&Quot; Due To Conflict
00:51 Accepted Answer Score 25
01:13 Answer 2 Score 15
01:25 Answer 3 Score 9
01:39 Thank you

--

Full question
https://superuser.com/questions/379443/u...

--

Content licensed under CC BY-SA
https://meta.stackexchange.com/help/lice...

--

Tags
#linux #commandline #unix #git

#avk47

ACCEPTED ANSWER

Score 25

The stash has already been applied to other files; it is only page/search.php that you have to merge manually. Afterwards just run git reset to unstage the changes and keep on hacking – or git add ... and commit.

ANSWER 2

Score 15

Resolved with:

git stash show -p

ANSWER 3

Score 9

After the git stash pop command, you then have to resolve the conflict by hand then do git stash drop manually as the man git-stash suggests.