Outdated PR diff2019 Community Moderator ElectionWhat are some examples of commonly used practices for naming git branches?Git for beginners: The definitive practical guideHow to selectively merge or pick changes from another branch in Git?Git workflow and rebase vs merge questionsHow do you get git to always pull from a specific branch?Showing which files have changed between two revisionsHow do I properly force a Git push?What is the best (and safest) way to merge a Git branch into master?Git diff against a stashVarious ways to remove local Git changes
How do you make a gun that shoots melee weapons and/or swords?
Do black holes violate the conservation of mass?
Idiom for feeling after taking risk and someone else being rewarded
Was it really inappropriate to write a pull request for the company I interviewed with?
Does an unused member variable take up memory?
PTIJ: Who was the sixth set of priestly clothes for?
Playing a 7-string guitar song on a 6-string guitar
Numerical value of Determinant far from what it is supposed to be
One circle's diameter is different from others within a series of circles
Giving a career talk in my old university, how prominently should I tell students my salary?
Origin of the word “pushka”
Translation of 答えを知っている人はいませんでした
Is it appropriate to ask a former professor to order a book for me through an inter-library loan?
Are all players supposed to be able to see each others' character sheets?
What is this tube in a jet engine's air intake?
What is Tony Stark injecting into himself in Iron Man 3?
Is it possible to clone a polymorphic object without manually adding overridden clone method into each derived class in C++?
Should we avoid writing fiction about historical events without extensive research?
Difference between `nmap local-IP-address` and `nmap localhost`
Do Cubics always have one real root?
I can't die. Who am I?
Having the player face themselves after the mid-game
What is better: yes / no radio, or simple checkbox?
What can I do if someone tampers with my SSH public key?
Outdated PR diff
2019 Community Moderator ElectionWhat are some examples of commonly used practices for naming git branches?Git for beginners: The definitive practical guideHow to selectively merge or pick changes from another branch in Git?Git workflow and rebase vs merge questionsHow do you get git to always pull from a specific branch?Showing which files have changed between two revisionsHow do I properly force a Git push?What is the best (and safest) way to merge a Git branch into master?Git diff against a stashVarious ways to remove local Git changes
I've had a situation where a PR diff (from a feature branch to master) is different to a diff generated by comparing that ame feature branch to master.
The only thing I can think of is that GitHub 'freezes' the PR diff at the time of creation, and then that diff gets 'outdated' as master moves on (other feature branches get merged in).
Does GitHub 'freeze' PR diffs? If so, is there any way to 'refresh' it? Or is there a different reason for the diffs to be different?
git github
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
add a comment |
I've had a situation where a PR diff (from a feature branch to master) is different to a diff generated by comparing that ame feature branch to master.
The only thing I can think of is that GitHub 'freezes' the PR diff at the time of creation, and then that diff gets 'outdated' as master moves on (other feature branches get merged in).
Does GitHub 'freeze' PR diffs? If so, is there any way to 'refresh' it? Or is there a different reason for the diffs to be different?
git github
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
add a comment |
I've had a situation where a PR diff (from a feature branch to master) is different to a diff generated by comparing that ame feature branch to master.
The only thing I can think of is that GitHub 'freezes' the PR diff at the time of creation, and then that diff gets 'outdated' as master moves on (other feature branches get merged in).
Does GitHub 'freeze' PR diffs? If so, is there any way to 'refresh' it? Or is there a different reason for the diffs to be different?
git github
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
I've had a situation where a PR diff (from a feature branch to master) is different to a diff generated by comparing that ame feature branch to master.
The only thing I can think of is that GitHub 'freezes' the PR diff at the time of creation, and then that diff gets 'outdated' as master moves on (other feature branches get merged in).
Does GitHub 'freeze' PR diffs? If so, is there any way to 'refresh' it? Or is there a different reason for the diffs to be different?
git github
git github
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
asked Mar 6 at 22:39
zoran119zoran119
4,50763469
4,50763469
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
Essentially yes; Git will freeze the diff of the PR at the point at which the PR was created. If something else has been merged into master subsequent to you creating the PR, the head sections will differ, and as such the diff will also differ.
In order to see only your changes (and not those made to master in the mean-time), you can use the triple-dot syntax:
git diff develop...master
This will essentially show you the "merge base" of these two branches (the last common commit):
If additional work is required on the same branch after a pull request is merged, you can still create a subsequent commit on that feature branch and then create a second pull request. This will have the same effect of creating an independent feature branch for the second commit, though this can be useful for tracking associated work. Note that the subsequent pull request would carry the changes from both commits; it contains all of the first commit plus any changes made after it. As such, there is no difference between choosing to merge both pull requests or only merging the latter.
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
add a comment |
Your Answer
StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");
StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);
else
createEditor();
);
function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);
);
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55033326%2foutdated-pr-diff%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
Essentially yes; Git will freeze the diff of the PR at the point at which the PR was created. If something else has been merged into master subsequent to you creating the PR, the head sections will differ, and as such the diff will also differ.
In order to see only your changes (and not those made to master in the mean-time), you can use the triple-dot syntax:
git diff develop...master
This will essentially show you the "merge base" of these two branches (the last common commit):
If additional work is required on the same branch after a pull request is merged, you can still create a subsequent commit on that feature branch and then create a second pull request. This will have the same effect of creating an independent feature branch for the second commit, though this can be useful for tracking associated work. Note that the subsequent pull request would carry the changes from both commits; it contains all of the first commit plus any changes made after it. As such, there is no difference between choosing to merge both pull requests or only merging the latter.
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
add a comment |
Essentially yes; Git will freeze the diff of the PR at the point at which the PR was created. If something else has been merged into master subsequent to you creating the PR, the head sections will differ, and as such the diff will also differ.
In order to see only your changes (and not those made to master in the mean-time), you can use the triple-dot syntax:
git diff develop...master
This will essentially show you the "merge base" of these two branches (the last common commit):
If additional work is required on the same branch after a pull request is merged, you can still create a subsequent commit on that feature branch and then create a second pull request. This will have the same effect of creating an independent feature branch for the second commit, though this can be useful for tracking associated work. Note that the subsequent pull request would carry the changes from both commits; it contains all of the first commit plus any changes made after it. As such, there is no difference between choosing to merge both pull requests or only merging the latter.
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
add a comment |
Essentially yes; Git will freeze the diff of the PR at the point at which the PR was created. If something else has been merged into master subsequent to you creating the PR, the head sections will differ, and as such the diff will also differ.
In order to see only your changes (and not those made to master in the mean-time), you can use the triple-dot syntax:
git diff develop...master
This will essentially show you the "merge base" of these two branches (the last common commit):
If additional work is required on the same branch after a pull request is merged, you can still create a subsequent commit on that feature branch and then create a second pull request. This will have the same effect of creating an independent feature branch for the second commit, though this can be useful for tracking associated work. Note that the subsequent pull request would carry the changes from both commits; it contains all of the first commit plus any changes made after it. As such, there is no difference between choosing to merge both pull requests or only merging the latter.
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
Essentially yes; Git will freeze the diff of the PR at the point at which the PR was created. If something else has been merged into master subsequent to you creating the PR, the head sections will differ, and as such the diff will also differ.
In order to see only your changes (and not those made to master in the mean-time), you can use the triple-dot syntax:
git diff develop...master
This will essentially show you the "merge base" of these two branches (the last common commit):
If additional work is required on the same branch after a pull request is merged, you can still create a subsequent commit on that feature branch and then create a second pull request. This will have the same effect of creating an independent feature branch for the second commit, though this can be useful for tracking associated work. Note that the subsequent pull request would carry the changes from both commits; it contains all of the first commit plus any changes made after it. As such, there is no difference between choosing to merge both pull requests or only merging the latter.
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
edited Mar 6 at 22:59
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
answered Mar 6 at 22:43
Obsidian AgeObsidian Age
28.2k72344
28.2k72344
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
add a comment |
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
So if it does indeed 'freeze' the diff, does that mean that the set of changes applied to the merge commit when I merge the PR is different to what I'm seeing on the PR screen where I click the merge button?
– zoran119
Mar 6 at 23:21
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55033326%2foutdated-pr-diff%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
