让 AI 解决你的合并/变基冲突

发布于 1 月 31 日

Summary: "merde.ai" can resolve git conflicts. Automation is good for tedious tasks like handling git conflicts. Initially, using an LLM directly didn't work well but with prompt engineering, it's improving. LLMs require engineering effort to integrate well. Smaller models have quirks. Git's standard is to use human conflict resolution but there are trade-offs. "merde.ai" creates new branches for merging, low stakes. Users can try it by creating an account, getting a token, and using the client or the GitHub bot. Feedback is welcome.
Main points:
- "merde.ai" automates git conflict resolution.
- LLM integration needs engineering.
- Smaller models have issues.
- Git's human conflict resolution vs. using "merde.ai".
- "merde.ai" creates new branches without affecting working dir.
- Users can try via client or GitHub bot.
Key information:
- Benchmark scores improved with tricks.
- Different LLMs have varying merge quality.
- "merde.ai" is low-stakes and optional.
- Feedback via GitHub issue or email.
Important details:
- LLM-based conflict resolution initially scored single digits.
- Trailing whitespace can cause issues with smaller models.
- "merde.ai" creates local branches and sends repo data to server.
- GitHub bot takes tens of minutes to resolve conflicts.

阅读 9