Give a strategy for divergent branches

Author: Fryyyyy

turbinia/workers/analysis/yara.py

@@ -68,7 +68,7 @@ def update_rules(self, rules):
       try:
         repository = git.Repo(path)
         origin = repository.remotes.origin
-        origin.pull(depth=1)
+        origin.pull(depth=1, rebase=True)
         log.info('Successfully updated rules from %s in %s', repo, path)
       except git.exc.InvalidGitRepositoryError as e:
         log.error(