git-up icon indicating copy to clipboard operation
git-up copied to clipboard

Published 20 hours ago • verified publisher icon aanand

report merge conflicts on stash pop

Open brumm opened this issue 10 years ago • 0 comments 

stashing 5 changes
master                  up to date
redesign                fast-forwarding...
redesign--more          up to date
redesign--week-overview ahead of upstream
redesign--week-videos   up to date
unstashing

git up finished without telling me about the merge conflict that popping the stash had caused.

brumm avatar Jul 08 '15 13:07 brumm