Resolve issue with uncommited local and upstream changes
Resolve issue with uncommited local and upstream changes

which happens if user does changes without running the sync first

aldryn/aldryn-client,aldryn/aldryn-client