Sweep: allow for rebase.

[sweep-nightly[bot]]

Description

This pull request updates the conflict resolution strategy in the sweepai project from merging to rebasing. This change aims to streamline the integration of feature branches into the main branch by applying commits from the feature branch onto the base branch, thus keeping the project history cleaner and more linear.

Summary

• Changed the conflict resolution strategy from merge to rebase in on_merge_conflict.py.
• Added a step to fetch the latest changes from the origin before rebasing.
• Updated the error handling comment to reflect that conflicts may occur during rebase, not merge.
• Minor formatting fix in the email configuration line (removed trailing spaces).

Affected file: sweepai/handlers/on_merge_conflict.py.

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[bot]]

Rollback Files For Sweep

• [ ] Rollback changes to sweepai/handlers/on_merge_conflict.py

This is an automated message generated by Sweep AI.

[sweep-nightly[bot]]

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[bot]]

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:59pm