nextcloud / nextcloud/backportbot
Use a fallback mergetool to resolve easy conflicts
Nobody has claimed this yet.
- Dominant language
- TypeScript
- Stars
- 14
- Forks
- 8
- PR merge metrics
- No merged PRs in 30d
Description
While manually backporting https://github.com/nextcloud/documentation/pull/11565 I notice that git can't automatically cherry-pick the full changes to stable27. Locally I use kdiff3 as mergetool and running "git mergetool" resolves conflicts without my help. So it would be quite cool if the bot could resolve those as well. We might just want to show a warning that there were conflicts and those were resolved automatically.
Contributor guide
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.
Research direction
Start by tracing how the bot performs cherry-picks and handles conflicts during backporting. Check how invoking Git's mergetool could fit that flow, including the kdiff3 behavior described in the issue. Done means easy conflicts can be resolved automatically and the bot warns when conflicts were resolved.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, typescript
- Domain
- tooling
- Issue type
- Feature
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 38/100