GitHub PR shows conflict but local does not

Question

I use 2 main branch, master and release branch. Every PR will be merged to master first, and after proper testing, I will raise a PR to merge from master to release branch. I will not raise any PRs to merge into release except from master.

Based on this workflow, master branch should be merged into release branch without any conflict. However, sometimes it will show merge-conflict in GitHub PR page, whereas I can merge master into release branch without conflict in my local environment.

I notice that GitHub contains 3 merge options, simple merge, squash merge and rebase merge. Is the merge-conflict caused by the merge options I choose? How to solve this weird merge-conflict in GitHub?

Thanks

Answer 1

It appears to be a bug in GitHub. This worked for me:

1. Merge locally
2. Push up the updated branch
   • This automatically closed (merged) the PR on GitHub