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
squash 8ca46ba Initial draft of article
squash 74abb12 Reworking introductory paragraphs
squash 02221a7 Changes to match the Push style guide
pick ddef6dd Completed article for submission to Push
will not work as squashed commits must follow a picked commit:
pick 8ca46ba Initial draft of article
squash 74abb12 Reworking introductory paragraphs
squash 02221a7 Changes to match the Push style guide
squash ddef6dd Completed article for submission to Push
Conversely, the following text:
Change the file so that squash appears next to the commits you wish to squash, leaving pick next to the commit message you intende to preserve (in this case, ddef6dd Completed article...). The top of this example file, then, would look like:
is incorrect, too.
The text was updated successfully, but these errors were encountered:
@nils-werner You are correct, following the actual article give me the error: Cannot 'squash' without a previous commit
You can't see the commits and to get back to where you started, you need to put: $ git rebase --abort
The order of
squash
andpick
is incorrect:will not work as squashed commits must follow a picked commit:
Conversely, the following text:
is incorrect, too.
The text was updated successfully, but these errors were encountered: