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.
git up finished without telling me about the merge conflict that popping the stash had caused.