-
Notifications
You must be signed in to change notification settings - Fork 137
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 -i: error on fixup/squash when the corresponding pick was skipped #210
Comments
I am unable to wrap my head around how |
Imagine that the commit That'll conflict, right? Now, let's imagine that the fixup commit Obviously, we would want to skip |
Sorry for being away after asking so long.
But then the parts where the todo for interactive rebase is saved and HEAD is updated upon rebase --skip is in sequencer.c. |
That's probably not all that important for this ticket. It would probably make more sense to write a file into the state directory for the specific purpose of detecting when a fixup/squash is about to be applied but the initial commit of that fixup/squash was not successful. One option I can think of is to write a file before the initial pick before a fixup/squash chain (using You will have to familiarize yourself with the |
Imagine this todo list:
Now, as the oneline suggests, let's assume that the
pick
results in merge conflicts, and let's further assume that the user decided to skip it viagit rebase --skip
.Obviously, the
fixup
should not blindly amendHEAD
at this point, so we will probably want to error out with a helpful message.The text was updated successfully, but these errors were encountered: