New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

report merge conflicts on stash pop #97

Open

brumm opened this issue Jul 8, 2015 · 0 comments

brumm commented Jul 8, 2015

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.

The text was updated successfully, but these errors were encountered:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment