-
-
Notifications
You must be signed in to change notification settings - Fork 568
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
support conflict-free rebase instead of merge #816
Comments
Related to this: the pull branch feature will currently always merge, even though I have set to rebase by default in my Is the work to be done on this mostly user interface related or some technical limitations? AFAICT, If we can see/fix merge conflicts in gitui currently, rebasing should be very similar |
like I stated above:
|
|
(based on #302)
now that we support merging a branch #485 we can look into rebase instead of merge.
although this gets a tad more complicated since any rebase step could fail due to conflicts and then we need to be able to proceed the rebase after conflict resolution was done.
The text was updated successfully, but these errors were encountered: