Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a fallback mergetool to resolve easy conflicts #424

Open
ChristophWurst opened this issue Feb 22, 2024 · 0 comments
Open

Use a fallback mergetool to resolve easy conflicts #424

ChristophWurst opened this issue Feb 22, 2024 · 0 comments

Comments

@ChristophWurst
Copy link
Member

While manually backporting nextcloud/documentation#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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant