No error message when conflicts occur using `pull --rebase --autostash`

[srbs]

Version info

• OS: macOS 10.14
• Build: 2057

Description

When using git pull --rebase--autostash within Sublime Merge and conflicts arise upon applying the stash, SM shows a successful command execution, not a failed one.

This is partly due to git itself reporting a successful execution, but I think it would be prudent for SM to post-process --autostash executions to identify a failed state from the output or file status(es).

Steps to reproduce

Commands to create a example repos I used to reproduce:

mkdir __test; cd __test

mkdir remote; cd remote
git init

printf "test" > file.txt
git add file.txt
git commit -m initial

printf "test1" > file.txt
git commit -am change

cd ..
git clone remote local
cd local

git reset --hard HEAD~
printf "test2" > file.txt

smerge .

Steps to reproduce the behavior:

1. create the repository above
2. run the Pull... command using the pull --rebase --autosquash option
3. notice the execution was 'successful', yet there are merge conflicts

Expected behavior

An indication of an error during the stash pop step of --autostash

Screenshots

[srbs]

related: #1198