override alerts should cause a rewind attempt as well
When git says 'Your local changes to the following files would be
overwritten by checkout' we should probably try a rewind as well.
diff --git a/src/plugins/scanners/git-sync.py b/src/plugins/scanners/git-sync.py
index fcfe136..c497e52 100644
--- a/src/plugins/scanners/git-sync.py
+++ b/src/plugins/scanners/git-sync.py
@@ -101,7 +101,7 @@
except subprocess.CalledProcessError as err:
e = str(err.output).lower()
# We're interested in merge conflicts, which we can resolve through trickery.
- if n > 0 or not ('resolve' in e or 'merge' in e):
+ if n > 0 or not ('resolve' in e or 'merge' in e or 'overwritten' in e):
# This isn't a merge conflict, pass it to outer func
raise err
else:
