From 41f942d3f4dae78e75175bd4fe727e47b3661380 Mon Sep 17 00:00:00 2001 From: Ruth Ikegah Date: Tue, 13 Oct 2020 13:28:05 +0100 Subject: [PATCH 1/3] Update about-pull-requests.md --- .../about-pull-requests.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index 96c0cc49e0e5..29789678ad08 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,6 +53,10 @@ When you create a pull request, you can choose to create a pull request that is {% data reusables.pull_requests.mark-ready-review %} You can convert a pull request to a draft at any time. For more information, see "[Changing the stage of a pull request](/articles/changing-the-stage-of-a-pull-request)." +### Difference between commits on Compare page and Pull Request page + +Compare pages show a compare between the tip of the head ref and the current common ancestor (i.e. merge base) of the head and base ref. On the other hand, pull request pages show a compare between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. In other words, the merge base used for the comparison might be different. + ### Further reading - "[Pull request](/articles/github-glossary/#pull-request)" in the {% data variables.product.prodname_dotcom %} glossary From e0856f2fb120cc99898fba80f311a7661ce3d1b5 Mon Sep 17 00:00:00 2001 From: Ruth Ikegah Date: Thu, 15 Oct 2020 18:26:16 +0100 Subject: [PATCH 2/3] Update content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md Co-authored-by: Felicity Chapman --- .../about-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index 29789678ad08..bcb266976f1d 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -53,7 +53,7 @@ When you create a pull request, you can choose to create a pull request that is {% data reusables.pull_requests.mark-ready-review %} You can convert a pull request to a draft at any time. For more information, see "[Changing the stage of a pull request](/articles/changing-the-stage-of-a-pull-request)." -### Difference between commits on Compare page and Pull Request page +### Differences between commits on compare and pull request pages Compare pages show a compare between the tip of the head ref and the current common ancestor (i.e. merge base) of the head and base ref. On the other hand, pull request pages show a compare between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. In other words, the merge base used for the comparison might be different. From 5c31f1ad87ff1a83a55277d5eddb8338b09a4218 Mon Sep 17 00:00:00 2001 From: Ruth Ikegah Date: Thu, 15 Oct 2020 18:27:18 +0100 Subject: [PATCH 3/3] Update content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md Co-authored-by: Felicity Chapman --- .../about-pull-requests.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md index bcb266976f1d..0345e2af7d9e 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md @@ -55,7 +55,10 @@ When you create a pull request, you can choose to create a pull request that is ### Differences between commits on compare and pull request pages -Compare pages show a compare between the tip of the head ref and the current common ancestor (i.e. merge base) of the head and base ref. On the other hand, pull request pages show a compare between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. In other words, the merge base used for the comparison might be different. +The compare and pull request pages use different methods to calculate the diff for changed files: + +- Compare pages show the diff between the tip of the head ref and the current common ancestor (that is, the merge base) of the head and base ref. +- Pull request pages show the diff between the tip of the head ref and the common ancestor of the head and base ref at the time when the pull request was created. Consequently, the merge base used for the comparison might be different. ### Further reading