You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.