diff options
| -rw-r--r-- | devbot/git.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devbot/git.py b/devbot/git.py index 8db61d2..e39993a 100644 --- a/devbot/git.py +++ b/devbot/git.py @@ -35,7 +35,7 @@ class Module: if self.tag: command.run(["git", "checkout", self.tag]) else: - command.run(["git", "merge", "origin", self._branch]) + command.run(["git", "merge", "--ff-only", "origin", self._branch]) def clean(self): try: |