Unable to 'git stash pop' due to conflict

--------------------------------------------------
--------------------------------------------------

Music by Eric Matyas
Track title: Drifting Through My Dreams

--

Chapters
00:00 Question
01:14 Accepted answer (Score 25)
01:39 Answer 2 (Score 15)
01:50 Answer 3 (Score 9)
02:10 Thank you

--

Full question

--

Content licensed under CC BY-SA

--

Tags
#linux #commandline #unix #git

#avk47