feat: Updated 1 files

sweepai · Apr 8, 2024 · 32d958c · 32d958c
1 parent 0277fad
commit 32d958c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/sweepai/handlers/on_merge_conflict.py b/sweepai/handlers/on_merge_conflict.py
@@ -184,11 +184,12 @@ def edit_comment(body):
                 "user", "name", "sweep-nightly[bot]"
             ).release()
             git_repo.config_writer().set_value(
-                "user", "email", "team@sweep.dev"
+                "user", "email", "team@sweep.dev"  
             ).release()
-            git_repo.git.merge("origin/" + pr.base.ref)
+            git_repo.git.fetch()
+            git_repo.git.rebase("origin/" + pr.base.ref)
         except GitCommandError:
-            # Assume there are merge conflicts
+            # Assume there are conflicts during rebase
             pass
 
         git_repo.git.add(update=True)