diff --git a/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md index ac1383ed32d8..c6952a580b6d 100644 --- a/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md @@ -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 @@ -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`. diff --git a/data/reusables/files/choose_pull_request.md b/data/reusables/files/choose_pull_request.md new file mode 100644 index 000000000000..0f44609362fe --- /dev/null +++ b/data/reusables/files/choose_pull_request.md @@ -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. diff --git a/data/reusables/files/confirm_merge.md b/data/reusables/files/confirm_merge.md new file mode 100644 index 000000000000..44576e1a37cf --- /dev/null +++ b/data/reusables/files/confirm_merge.md @@ -0,0 +1 @@ +1. Click **Confirm merge**. diff --git a/data/reusables/files/delete_branch.md b/data/reusables/files/delete_branch.md new file mode 100644 index 000000000000..651f7eae615a --- /dev/null +++ b/data/reusables/files/delete_branch.md @@ -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)." diff --git a/data/reusables/files/merge_pull_request.md b/data/reusables/files/merge_pull_request.md new file mode 100644 index 000000000000..21365cb488ee --- /dev/null +++ b/data/reusables/files/merge_pull_request.md @@ -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)." diff --git a/data/reusables/files/write_commit_message_pull_request.md b/data/reusables/files/write_commit_message_pull_request.md new file mode 100644 index 000000000000..ba5c7925d76c --- /dev/null +++ b/data/reusables/files/write_commit_message_pull_request.md @@ -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)