Aborting git stash due to merge conflictsD·Feb 13, 2023·1 min readgit reset --merge Note: stashed change will NOT be lost Ref: https://stackoverflow.com/a/60444590 Gitgit stash