Unable to apply a suggestion to a file conflict to the main branch: This diff has recently been updated.

[ShamrockLee]

Select Topic Area

Bug

Body

Update: See the comment below for relevent description of the bug.

Apply review suggestions in batch is a great feature!

However, when trying to apply four independent review suggestions in batch, the GitHub web page complains

This diff has recently been updated. Please refresh and try again.

and fails.

The same problem repeats after doing the same thing again, and I see no "changes" happen in the mean time.

[ShamrockLee]

Update:

It's not about the batch suggestion commit, but about applying commit suggestions to files that has merge conflict to the branch this PR is to be merged into.

This is still a bug, as the commit-suggestion feature should only concern about the branch that holds the changes in this PR, not the branch to merge the changes into.

[Frigyes06]

Can reproduce, super annoying

[arishojaswi]

Facing the same issue. Extremely frustrating.

[isdanni]

Facing the same issue, wondering when this will be fixed

[jfullstackdev]

not sure what situation you are in, but Copilot answered because I asked him too :

The error message "This diff has recently been updated. Please refresh and try again." typically appears in the context of using GitHub, particularly when you're reviewing pull requests.

This error usually occurs when the pull request you're reviewing has been updated while you were in the process of reviewing it. This could be due to new commits being pushed to the branch, changes being made to the base branch, or the pull request being merged or closed.

The error is essentially telling you that the state of the pull request has changed since you last loaded the page, and you need to refresh the page to see the most recent changes.

To resolve this error, you can simply refresh the page (F5 or Ctrl+R in most browsers) and continue your review with the updated changes. If the error persists, it might be a temporary issue with GitHub, and you could try again after a few minutes.

[ShamrockLee]

Please take a look at the update. The issue is not about diff view awaiting updating, but about failure to apply suggestions as patches to the feature branch, when the feature branch cannot be merged automatically into the base branch.

This application failure is unexpected, because the suggested changes go to the feature branch instead of the base branch.

[ShamrockLee]

Sorry for causing the confusion. I just added an update link on top of the Body section.

[jan-neduchal]

Still not fixed

[Andrew-T-Smith]

Still not fixed as of today. The explanation at the least needs to be improved because I just assumed github was having a service outage.