diff --git a/usr/bin/sapphrc_updown b/usr/bin/sapphrc_updown index 9e5865c..8594dc4 100755 --- a/usr/bin/sapphrc_updown +++ b/usr/bin/sapphrc_updown @@ -10,7 +10,7 @@ gs="$(git status | grep -i 'modified')" git fetch origin reslog=$(git log HEAD..origin/main --oneline) -if [[ "${gs}" == *"modified"* && "${reslog}" == "" ]];then +if [[ "${gs}" == *"modified"* && "${reslog}" != "" ]];then #local AND remote changes exist echo "local backup reposity conflict with remote - please manually fix this!" exit 1