Skip to content

user confirm merge #565

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

Merged
merged 8 commits into from
Mar 3, 2021
Merged

user confirm merge #565

merged 8 commits into from
Mar 3, 2021

Conversation

extrawurst
Copy link
Collaborator

closes #557

@extrawurst extrawurst merged commit 51c9085 into master Mar 3, 2021
@extrawurst extrawurst deleted the fix-557-confirm-merge branch March 3, 2021 21:06
extrawurst pushed a commit that referenced this pull request May 27, 2021
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

Successfully merging this pull request may close these issues.

support simple conflict-free 3way merge
1 participant