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

support stateful rebase (with conflicts) #895

Closed

4 tasks

extrawurst opened this issue Sep 6, 2021 · 0 comments · Fixed by #897

Labels

feature-request

Milestone

Owner

extrawurst commented Sep 6, 2021

based on #816:

but this time even with conflicts!

rebase interrupts on conflicts
this state is reflected visually
rebase can be aborted fixing the state of the repo
after fixing a conflict the rebase can be continued

extrawurst added the feature-request label

extrawurst added this to the v0.18 milestone

extrawurst changed the title ~~support stateful rebase (with conflict)~~ support stateful rebase (with conflicts)

extrawurst mentioned this issue

allow rebase with conflicts (WIP) #897

Merged

extrawurst closed this as completed in #897

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