-
Notifications
You must be signed in to change notification settings - Fork 22
Open
Description
The order of squash and pick is incorrect:
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.
Metadata
Metadata
Assignees
Labels
No labels