fix: Stash pop removes stash from list even when there are conflicts

[wugeer]

This Pull Request fixes/closes #2372 .

It changes the following:

• stash_pop not remove stash from list even when there are conflicts

before change
before1005.webm

after change
after1005.webm

stash pop success
success1005.webm

I followed the checklist:

• I added unittests
• I ran make check without errors
• I tested the overall application
• I added an appropriate item to the changelog

[wugeer]

@extrawurst Hello, could you please take a moment to review this PR? If the changes aren't good enough, I'll continue working on improving them. :)

[cruessler]

I’ll have a look later in the day!

[extrawurst]

@wugeer in any case we would need you to update your branch

[cruessler]

@wugeer Can you try the latest master to see whether this issue still needs fixing? I’m asking because gitui already refuses to pop a stash on my machine with the following error message when popping would result in a conflict: git error:1 conflict prevents checkout; class=Checkout (20); code=Conflict (-13). Thanks!

[wugeer]

@cruessler Sorry for the late response. I've resubmitted the code. Could you please review it when you have a moment? Thanks!

[cruessler]

@wugeer Can you try the latest master to see whether your PR is still necessary? When trying to apply a stash that would resolve in conflicts, gitui refuses to pop the stash on my machine with the following error message: git error:1 conflict prevents checkout; class=Checkout (20); code=Conflict (-13).

[wugeer]

@cruessler Indeed, this issue has been fixed in the latest code. Thank you for your reminder and assistance. I will close this PR. Thanks again for your help.

[cruessler]

Glad I could help, thanks for your efforts!