Open
Description
Imagine this todo list:
pick a123 this will conflict
fixup b124 want to fix up
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 via git rebase --skip
.
Obviously, the fixup
should not blindly amend HEAD
at this point, so we will probably want to error out with a helpful message.