Sweep: allow for rebase.

[sweep-nightly]

Description

This pull request introduces changes to the way merge conflicts are handled by implementing a rebase strategy instead of the previous merge approach. It includes the addition of a new utility function rebase_branch in sweepai/utils/github_utils.py and its application within the on_merge_conflict.py handler.

Summary

• Added a new function rebase_branch in sweepai/utils/github_utils.py to facilitate rebasing a branch onto another. This function handles rebase conflicts by preferring the version from the target branch.
• Modified sweepai/handlers/on_merge_conflict.py to use the new rebase_branch function instead of merging. This change aims to streamline the resolution of merge conflicts by rebasing the new branch onto the base branch.
• Updated exception handling in on_merge_conflict.py to catch general exceptions during git user configuration, improving the robustness of the error handling process.
• Removed the previous merge conflict resolution code in favor of the new rebase approach, simplifying the conflict resolution process.

Fixes #3284.

---

🎉 Latest improvements to Sweep:

• New dashboard launched for real-time tracking of Sweep issues, covering all stages from search to coding.
• Integration of OpenAI's latest Assistant API for more efficient and reliable code planning and editing, improving speed by 3x.
• Use the GitHub issues extension for creating Sweep issues directly from your editor.

---

💡 To get Sweep to edit this pull request, you can:

• Comment below, and Sweep can edit the entire PR
• Comment on a file, Sweep will only modify the commented file
• Edit the original issue to get Sweep to recreate the PR from scratch

This is an automated message generated by Sweep AI.

[sweep-nightly]

Rollback Files For Sweep

• Rollback changes to sweepai/handlers/on_merge_conflict.py
• Rollback changes to sweepai/utils/github_utils.py

This is an automated message generated by Sweep AI.

[sweep-nightly]

Apply Sweep Rules to your PR?

• Apply: We should use loguru for error logging. If the log is inside an exception, use logger.exception to add tracebacks, where logger is imported from loguru. Use f-strings for string formatting in logger calls (e.g. logger.info(f'Hello {name}') instead of logger.info('Hello {name}', name=name)).
• Apply: There should be no debug log or print statements in production code.
• Apply: All functions should have parameters and output annotated with type hints. Use list, tuple and dict instead of typing.List, typing.Tuple and typing.dict.
• Apply: Leftover TODOs in the code should be handled.
• Apply: All new business logic should have corresponding unit tests in the same directory. For example, sweepai/api_test.py tests sweepai/api.py. Use unittest and unittest.mock as required.
• Apply: Any clearly inefficient or repeated code should be optimized or refactored.
• Apply: Remove any comments before code that are obvious. For example # this prints hello world; print('hello world').

This is an automated message generated by Sweep AI.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
sweep-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 8, 2024 5:22pm