13 lines
469 B
Diff
13 lines
469 B
Diff
diff --git i/marge/batch_job.py w/marge/batch_job.py
|
|
index b6423d8..3db302f 100644
|
|
--- i/marge/batch_job.py
|
|
+++ w/marge/batch_job.py
|
|
@@ -205,6 +205,8 @@ class BatchMergeJob(job.MergeJob):
|
|
# Rebase and apply the trailers
|
|
self.update_merge_request(merge_request, source_repo_url=source_repo_url)
|
|
|
|
+ time.sleep(10)
|
|
+
|
|
# This switches git to <target_branch>
|
|
final_sha = self.merge_batch(
|
|
merge_request.target_branch,
|