Skip to content

Commit

Permalink
Add a blurb about disabling squash merging
Browse files Browse the repository at this point in the history
  • Loading branch information
jsf9k committed Aug 24, 2021
1 parent 66e110f commit fd7af7b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions project_setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ branch protection - [see our branch protection guide for details](branch-protect
- [Selecting a skeleton](#selecting-a-skeleton)
- [Cloning a selected skeleton](#cloning-a-selected-skeleton)
- [Create and publish the GitHub repository](#create-and-publish-the-github-repository)
- [Disabling squash merging](#disabling-squash-merging)
- [Set up your environment and pre-commit](#set-up-your-environment-and-pre-commit)
- [Create an initial pull request](#create-an-initial-pull-request)
- [Setting up branch protection](#setting-up-branch-protection)
Expand Down Expand Up @@ -161,6 +162,12 @@ Next, publish your new repository to GitHub:
git push --set-upstream origin develop
```

## Disabling squash merging ##

Click on the settings tab for your new repository and, in the
"Options" section, make sure that "Allow squash merging" is
_unchecked_.

## Set up your environment and pre-commit ##

Follow the instructions in [CONTRIBUTING.md on setting up pre-commit](../CONTRIBUTING.md#setting-up-pre-commit)
Expand Down

0 comments on commit fd7af7b

Please sign in to comment.