Skip to content

Documentation Issue: Submit as One Commit #16

Description

@nils-werner

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.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions