Added "contains work" error for git push

2016-07-07 11:47:51 +02:00
parent a3b2e6872b
commit 837ca73f50
2 changed files with 30 additions and 1 deletions
@@ -8,7 +8,7 @@ def match(command):
    return ('push' in command.script
            and '! [rejected]' in command.stderr
            and 'failed to push some refs to' in command.stderr
-            and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
+            and (('Updates were rejected because the tip of your current branch is behind' in command.stderr) or 'Updates were rejected because the remote contains work that you do' in command.stderr))


@git_support