Pull request showing commits that have already been merged (via fast-forward merge) #39031
Replies: 9 comments 1 reply
-
As a workaround you can change the base branch for the PR to some other branch and then back to |
Beta Was this translation helpful? Give feedback.
-
Did anyone find a more permanent fix for this? I am experiencing old diffs all the time, it is really a hassle. |
Beta Was this translation helpful? Give feedback.
-
Same here we're experiencing the same issue |
Beta Was this translation helpful? Give feedback.
{{title}}
{{editor}}'s edit
{{editor}}'s edit
-
Seeing this lately here as well, but on github.com, not Github Enterprise. |
Beta Was this translation helpful? Give feedback.
-
Im seeing this as well on github.com. Driving me nuts. |
Beta Was this translation helpful? Give feedback.
-
I'm seeing the same behavior on github.com. It's so hard to then tell what changes are 'actually' to be reviewed and merged in the PR. I tried the switch-the-base-branch work around, but to no avail. |
Beta Was this translation helpful? Give feedback.
-
To me, this is a major bug and flaw in GitHub. The whole reason we use PRs is to understand what has changed and review them. We can't trust the most basic functionality of the product. This is ridiculous. |
Beta Was this translation helpful? Give feedback.
-
I ran into this today for the first time and thought I was taking crazy pills:
I was getting ready to pile onto this issue, HOWEVER I noticed one key thing that I usually do that I forgot to do in this case, which I will share in case anyone is dense like me. After merging my last PR, I forgot to pull |
Beta Was this translation helpful? Give feedback.
-
I'm experiencing the same issue as well. Has anyone got a solution for this? |
Beta Was this translation helpful? Give feedback.
{{title}}
-
Select Topic Area
Bug
Body
Using GitHub enterprise, I have the following situation:
master
is at SHAdeadbeef
feature/branch1
is 3x commits ahead ofmaster
(fast-forward mergable intomaster
)feature/branch2
is 2x commits ahead offeature/branch1
(fast-forward mergable into bothmaster
andfeature/branch1
)I open up a couple of PRs:
feature/branch1
intomaster
(PR 1)feature/branch2
intomaster
(PR 2)Initially, PR 2 shows the commits from both
feature/branch1
&feature/branch2
- this is expected (total of 5 commits on the PR). However when I merge PR 1 (by way of fast-forward merge), the commit list in PR 2 continues to show all 5 commits (including the 3 that have already been merged).Expected behvaiour is for PR 2 to update and only show the (2x) commits that have not yet been merged into master yet. Note that if I create a brand new PR (merging
feature/branch2
intomaster
) then it only shows the 2x commits.Beta Was this translation helpful? Give feedback.
All reactions