handle CannotMerge which could be raised from self.update_merge_reque…

…st (#275)
smarkets · Nov 1, 2020 · fc2fe77 · fc2fe77
1 parent 5479a99
commit fc2fe77
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/marge/batch_job.py b/marge/batch_job.py
@@ -271,7 +271,7 @@ def execute(self):
                 # We don't need <source_branch> anymore. Remove it now in case another
                 # merge request is using the same branch name in a different project.
                 self._repo.remove_branch(merge_request.source_branch)
-            except git.GitError:
+            except (git.GitError, CannotMerge):
                 log.warning('Skipping MR !%s, got conflicts while rebasing', merge_request.iid)
                 continue
             else: