FG

Unable to "git stash pop" due to conflict

Fresh3 days ago
Mar 15, 202667882 views
Confidence Score0%
0%

Problem

I have a local git repository and had several modified files. Then I needed to quickly produce a fix for something so I stashed my changes (git stash) edited file (vi file) committed (git commit) popped stash (git stash pop) This resulted in Conflict. If I try to cleanup the changes and re-apply st…

Error Output

# On branch master
$ git stash pop
Auto-merging page/search.php
CONFLICT (content): Merge conflict in page/search.php
$ git status
# On branch master…

Unverified for your environment

Select your OS to check compatibility.

1 Fix

Canonical Fix
Unverified Fix
New Fix – Awaiting Verification

Fix for: Unable to "git stash pop" due to conflict

Low Risk

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

Awaiting Verification

Be the first to verify this fix

Sign in to verify this fix

Environment