-
Notifications
You must be signed in to change notification settings - Fork 130
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
rebase: allow combining --whitespace=fix
with --interactive
#1472
Comments
The complexity of this project stems from the fact that the In the
A viable approach to add One particularly tricky aspect about trying to do That is very different from what However, we still face a bit of a problem in case So essentially, before we generate conflicts for overlapping line ranges, we have to be careful to treat white-space fixes in Not exactly trivial, right? So now that I scared the heck out of most, for those readers who made it this far, here is an alternative to consider: apply After this is implemented, we still have a little bit more to do to actually finish this ticket up: we have to cope with |
Hi Dscho, nice write-up :) I had a feeling that when I wrote this:
" a big ask" was an understatement. With what you outline above, I understand more what it entails. A few questions:
Also, I thought of this:
|
I tried to be mindful of the motivation. And honestly, to me it sounds much more enticing to teach the interactive rebase to fix white-space issues than to teach the
Indeed. And I don't want to make the big ask of supporting
What the callback will actually need is a pointer to a |
It is a long time thorn in the side of every user of
--whitespace=fix
that it does not work in themerge
/interactive
rebase backend.There was already an attempt, as a part of a Google Summer of Code project, to address this, but it was considered a "bonus feature" and it's just too complex a task on its own to tack onto any meaningful project.
The text was updated successfully, but these errors were encountered: