opt-in mergiraf solve / report command
Nobody has claimed this yet.
Assessment
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Newbie friendliness
- 45/100
- Issue type
- Feature
- Clarity
- Mostly clear
- Activity status
- Quiet
- Tech stack
- git
- Domain
- cli, developer-experience, tooling
Research direction
Start by examining the existing auto-mergiraf behavior and the forward-port flow involving git-fw. Trace the entry points for mergiraf solve and merge-driver configuration, then document local setup and validation alongside git-fw. Done means explicit resolution is available without automatic use, with the user responsible for its results.
Written by the indexing model from the issue text.
Description
Auto-mergiraf was attempted multiple times and disabled every time as it can corrupt files in a way which may or may not be caught during testing (e.g. https://discord.com/channels/678381219515465750/704997651833159831/1441364779955388419). It should probably be removed.
However an explicit request to autoresolve (either via mergiraf solve, or via re-doing the forward-port with mergiraf set as merge driver) could be nice, under the assumption that the results are still the responsibility of the user / employee, and so corruptions / false positives would be less problematic. This should be implemented alongside a guide to configure merge drivers locally (with validation that they work alongside git-fw).
Furthermore this could be expanded to arbitrary merge drivers in case someone wants to use weave or is insane enough for rizzler.
- Dominant language
- Python
- Stars
- 159
- Forks
- 156
- Avg merge
- 1d 13h
- Merged PRs (30d)
- 16
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from odoo/runbot
-
mergebot
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
-
mergebot
Difficulty 4/5 3-5 days Newbie friendliness 48/100
-
mergebot
Difficulty 3/5 1-2 days Newbie friendliness 48/100
-
mergebot
Difficulty 4/5 3-5 days Newbie friendliness 48/100
-
mergebot
Difficulty 5/5 Over a week Newbie friendliness 25/100
Similar issues
-
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
bancolombia/sentinel#23 ·
-
test md OpenCI
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
-
integration:quickjs org:external priority:backlog topic:code-interpreter topic:middleware type:feature
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
langchain-ai/deepagents#6450 ·
-
bug client
Difficulty 2/5 1-3 hours Newbie friendliness 88/100
-
Difficulty 2/5 1-3 hours Newbie friendliness 74/100