From 5424d6d8dc6deb187b38a352f298a14ff4e3fca8 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:33:19 +0100 Subject: [PATCH 01/12] Create choose_pull_request.md --- data/reusables/files/choose_pull_request.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/files/choose_pull_request.md diff --git a/data/reusables/files/choose_pull_request.md b/data/reusables/files/choose_pull_request.md new file mode 100644 index 000000000000..2dee0cf50321 --- /dev/null +++ b/data/reusables/files/choose_pull_request.md @@ -0,0 +1 @@ +1. Once you create the Pull Request with your changes, in the "Pull Requests" list, click the pull request you'd like to merge. From 02a0d316ce38f693a728c6cbff56699e9ede275b Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:35:29 +0100 Subject: [PATCH 02/12] Create merge_pull_request.md --- data/reusables/files/merge_pull_request.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/files/merge_pull_request.md diff --git a/data/reusables/files/merge_pull_request.md b/data/reusables/files/merge_pull_request.md new file mode 100644 index 000000000000..4793b94b1b34 --- /dev/null +++ b/data/reusables/files/merge_pull_request.md @@ -0,0 +1 @@ +1. Merge all of the commits into the base branch by clicking **Merge pull request**. For more information, see "[Merging a Pull Request](/github/collaborating-with-issues-and-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)". From 84c1db28dae4599ee0acac7ceb84ec6f911ef3b1 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:36:44 +0100 Subject: [PATCH 03/12] Create write_commit_message_pull_request.md --- data/reusables/files/write_commit_message_pull_request.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/reusables/files/write_commit_message_pull_request.md 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) From e8326e970579fd33013083e25e993104f5ea2ce0 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:37:17 +0100 Subject: [PATCH 04/12] Create confirm_merge.md --- data/reusables/files/confirm_merge.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/files/confirm_merge.md 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**. From f588855bd8b49103d0e8ca2ef41c74f84bdd989a Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:38:03 +0100 Subject: [PATCH 05/12] Create delete_branch.md --- data/reusables/files/delete_branch.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/files/delete_branch.md diff --git a/data/reusables/files/delete_branch.md b/data/reusables/files/delete_branch.md new file mode 100644 index 000000000000..bc1bf01e2608 --- /dev/null +++ b/data/reusables/files/delete_branch.md @@ -0,0 +1 @@ +1. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy. From a641adf698e2adbe35f824d4da48a5312f9e3252 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Sat, 22 May 2021 18:41:55 +0100 Subject: [PATCH 06/12] Update adding-content-to-your-github-pages-site-using-jekyll.md Updated with new partials for completing the merge of the PR. --- ...g-content-to-your-github-pages-site-using-jekyll.md | 10 ++++++++++ 1 file changed, 10 insertions(+) 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`. From b14b5087d079693fdbdbb330264571a4aeade723 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:23:33 +0100 Subject: [PATCH 07/12] Update choose_pull_request.md --- data/reusables/files/choose_pull_request.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/reusables/files/choose_pull_request.md b/data/reusables/files/choose_pull_request.md index 2dee0cf50321..30cf65006d63 100644 --- a/data/reusables/files/choose_pull_request.md +++ b/data/reusables/files/choose_pull_request.md @@ -1 +1,2 @@ -1. Once you create the Pull Request with your changes, in the "Pull Requests" list, click the pull request you'd like to merge. +1. Create a pull request for your proposed changes. +2. In the "Pull Requests" list, click the pull request you'd like to merge. From 987834788e62c66da223c8ab1eee936ddfadb4f4 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:24:26 +0100 Subject: [PATCH 08/12] Update data/reusables/files/delete_branch.md Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> --- data/reusables/files/delete_branch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/files/delete_branch.md b/data/reusables/files/delete_branch.md index bc1bf01e2608..2be8eca119c9 100644 --- a/data/reusables/files/delete_branch.md +++ b/data/reusables/files/delete_branch.md @@ -1 +1 @@ -1. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy. +1. Optionally, delete the branch. For more information, see "(/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository)." From d99c14ecdb29f484cba3e1fd740b16e2cbd203e4 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:24:46 +0100 Subject: [PATCH 09/12] Update data/reusables/files/merge_pull_request.md Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> --- data/reusables/files/merge_pull_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/files/merge_pull_request.md b/data/reusables/files/merge_pull_request.md index 4793b94b1b34..0fabb285b253 100644 --- a/data/reusables/files/merge_pull_request.md +++ b/data/reusables/files/merge_pull_request.md @@ -1 +1 @@ -1. Merge all of the commits into the base branch by clicking **Merge pull request**. For more information, see "[Merging a Pull Request](/github/collaborating-with-issues-and-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)". +1. Click **Merge pull request** For more information, see "[Merging a pull request](/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request)." From c3a92f5306ae77e9df23a556ecb424f793b36c75 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:34:22 +0100 Subject: [PATCH 10/12] Update delete_branch.md --- data/reusables/files/delete_branch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/files/delete_branch.md b/data/reusables/files/delete_branch.md index 2be8eca119c9..651f7eae615a 100644 --- a/data/reusables/files/delete_branch.md +++ b/data/reusables/files/delete_branch.md @@ -1 +1 @@ -1. Optionally, delete the branch. For more information, see "(/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository)." +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)." From bc7944746ef487ca78f70328d4349bec5a69c480 Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:34:38 +0100 Subject: [PATCH 11/12] Update merge_pull_request.md --- data/reusables/files/merge_pull_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/files/merge_pull_request.md b/data/reusables/files/merge_pull_request.md index 0fabb285b253..21365cb488ee 100644 --- a/data/reusables/files/merge_pull_request.md +++ b/data/reusables/files/merge_pull_request.md @@ -1 +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)." +1. Click **Merge pull request**. For more information, see "[Merging a pull request](/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request)." From d7aecd69cf3ba9f0d27d62295c8d8511c0e60efd Mon Sep 17 00:00:00 2001 From: alexandrammr Date: Wed, 26 May 2021 22:35:16 +0100 Subject: [PATCH 12/12] Update choose_pull_request.md --- data/reusables/files/choose_pull_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/files/choose_pull_request.md b/data/reusables/files/choose_pull_request.md index 30cf65006d63..0f44609362fe 100644 --- a/data/reusables/files/choose_pull_request.md +++ b/data/reusables/files/choose_pull_request.md @@ -1,2 +1,2 @@ 1. Create a pull request for your proposed changes. -2. In the "Pull Requests" list, click the pull request you'd like to merge. +2. In the "Pull Requests" list, click the pull request you would like to merge.