How to solve a git stash conflict

74 Views Asked by At

enter image description here

Hi guys I have the following issue.

  • I performed a git stash first
  • Then a git pull
  • then sorted out the conflicts
  • Now I am trying to do a git stash pop so as to bring back the changes I made and add them to my project and I am getting the above messages for each of the stashed files

Help, how do I proceed?

I have tried doing git stash pop to get the stashed files back

0

There are 0 best solutions below