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.

Sign up for GitHub

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

Jump to bottom

confirm 3way merge by user #563

Closed

extrawurst opened this issue Mar 3, 2021 · 0 comments

Milestone

Collaborator

extrawurst commented Mar 3, 2021

since #557 if a ff-merge is not possible we perform a 3way merge commit (if conflict free) but we should rather first ask the user if that's ok

extrawurst added this to the v0.12 milestone

extrawurst closed this as completed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment