feat: Updated 2 files

Author: sweep-nightly[bot]

sweepai/config/server.py

@@ -246,3 +246,5 @@
 JIRA_USER_NAME = os.environ.get("JIRA_USER_NAME", None)
 JIRA_API_TOKEN = os.environ.get("JIRA_API_TOKEN", None)
 JIRA_URL = os.environ.get("JIRA_URL", None)
+
+MERGE_CONFLICT_RESOLUTION_STRATEGY = os.environ.get("MERGE_CONFLICT_RESOLUTION_STRATEGY", "merge")

sweepai/handlers/on_merge_conflict.py

@@ -5,7 +5,7 @@
 from github.PullRequest import PullRequest
 from loguru import logger
 
-from sweepai.config.server import PROGRESS_BASE_URL
+from sweepai.config.server import MERGE_CONFLICT_RESOLUTION_STRATEGY, PROGRESS_BASE_URL
 from sweepai.core import entities
 from sweepai.core.entities import FileChangeRequest
 from sweepai.core.sweep_bot import SweepBot
@@ -186,7 +186,10 @@ def edit_comment(body):
             git_repo.config_writer().set_value(
                 "user", "email", "[email protected]"
             ).release()
-            git_repo.git.merge("origin/" + pr.base.ref)
+            if MERGE_CONFLICT_RESOLUTION_STRATEGY == "rebase":
+                git_repo.git.rebase("origin/" + pr.base.ref)
+            else:
+                git_repo.git.merge("origin/" + pr.base.ref)
         except GitCommandError:
             # Assume there are merge conflicts
             pass