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

support simple (conflict free) rebase merge #566

Closed

extrawurst opened this issue Mar 4, 2021 · 0 comments · Fixed by #567

Milestone

Owner

extrawurst commented Mar 4, 2021

now that we have the simple 3way merge (#557) it would be good to support the rebase merge that does not create a merge commit.

until we tackle #485 we revert as soon as we have a conflict

extrawurst mentioned this issue

support rebase merge (conflict free only) #567

Merged

2 tasks

extrawurst added this to the v0.13 milestone

extrawurst closed this as completed in #567

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