Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alexandrammr - Adding steps in instructions for #2150 #6667

Merged
merged 13 commits into from
May 27, 2021
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Your theme includes default layouts, includes, and stylesheets that will automat
{% data reusables.files.choose-commit-email %}
{% data reusables.files.choose_commit_branch %}
{% data reusables.files.propose_file_change %}
{% data reusables.files.choose_pull_request %}
{% data reusables.files.merge_pull_request %}
{% data reusables.files.write_commit_message_pull_request %}
{% data reusables.files.confirm_merge %}
{% data reusables.files.delete_branch %}

### Adding a new post to your site

Expand All @@ -64,6 +69,11 @@ Your theme includes default layouts, includes, and stylesheets that will automat
{% data reusables.files.choose-commit-email %}
{% data reusables.files.choose_commit_branch %}
{% data reusables.files.propose_file_change %}
{% data reusables.files.choose_pull_request %}
{% data reusables.files.merge_pull_request %}
{% data reusables.files.write_commit_message_pull_request %}
{% data reusables.files.confirm_merge %}
{% data reusables.files.delete_branch %}

Your post should now be up on your site! If the base URL of your site is `https://octocat.github.io`, then your new post will be located at `https://octocat.github.io/YYYY/MM/DD/TITLE.html`.

Expand Down
2 changes: 2 additions & 0 deletions data/reusables/files/choose_pull_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1. Create a pull request for your proposed changes.
2. In the "Pull Requests" list, click the pull request you would like to merge.
1 change: 1 addition & 0 deletions data/reusables/files/confirm_merge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1. Click **Confirm merge**.
1 change: 1 addition & 0 deletions data/reusables/files/delete_branch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1. Optionally, delete the branch. For more information, see "[Creating and deleting branches within your repository](/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository)."
1 change: 1 addition & 0 deletions data/reusables/files/merge_pull_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1. Click **Merge pull request**. For more information, see "[Merging a pull request](/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request)."
2 changes: 2 additions & 0 deletions data/reusables/files/write_commit_message_pull_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1. If prompted, type a commit message, or accept the default message.
![Commit message field](/assets/images/help/pull_requests/merge_box/pullrequest-commitmessage.png)