GitHub Community
Outdated code shown in compare/pull request #21902
-
|
I’ve forked someone’s repo to customize it for my own use. Since then they’ve updated their code and I want to merge the latest commits of thier master into my customized fork to keep my version up-to-date yet still customized. https://github.com/Drift91/Cops_FiveM/compare/dev…Kyominii:master Now if you compare the above comparison of changelog.md to the actual contents below, you’ll see that the comparison above is completely out of date. https://github.com/Drift91/Cops_FiveM/blob/dev/CHANGELOG.md It seems as if it’s comparing his master before I forked it to his current master instead of comparing my current dev branch to his current master branch. Is this a bug in the website or am I doing something wrong? If this is how it’s going to function then making a pull request to my code is useless and I might as well do everything manually in a text editor. Does someone know how to properly compare the most recent code of both forks? I’ve even tried using the hash of my most recent commit to compare and it still shows the outdated code. What’s weird is that even if I switch the direction of the comparison, it still shows the same outdated 1.4.0 code on the left. Thanks in advance for any assistance. |
Beta Was this translation helpful? Give feedback.
Replies: 3 comments
-
|
Hi @drift91 I’d recommend taking a look at our Help Docs on how to merge an upstream repository to your fork: https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ If there are conflicts (which it sounds like there might be), you’ll also want to check out the article on addressing merge conflicts: https://help.github.com/articles/addressing-merge-conflicts/ I hope these help! If you have further questions, please let me know! |
Beta Was this translation helpful? Give feedback.
-
|
I have the same problem. I created new branch, did the changes and tryed to compare branches. Now I have the filein 2 branches, but having differences when I comparing branches. |
Beta Was this translation helpful? Give feedback.
-
|
What you’re describing @divergence082 isn’t the same thing. You’re describing the same problem as is mentioned and answered here: |
Beta Was this translation helpful? Give feedback.
Hi @drift91
I’d recommend taking a look at our Help Docs on how to merge an upstream repository to your fork:
https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/
If there are conflicts (which it sounds like there might be), you’ll also want to check out the article on addressing merge conflicts:
https://help.github.com/articles/addressing-merge-conflicts/
I hope these help! If you have further questions, please let me know!