Github says that I have changes in my forked repo, but those changes are already merged in the main repoGit workflow and rebase vs merge questionsRemoving multiple files from a Git repo that have already been deleted from diskPull new updates from original GitHub repository into forked GitHub repositoryThrow away local commits in GitSend a pull request on GitHub for only latest commitHow do I properly force a Git push?Cannot push to GitHub - keeps saying need mergeDelete forked repo from GitHubPlease enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branchVarious ways to remove local Git changes
Is this homebrew "Cactus Grenade" cantrip balanced?
Cardio work for Muay Thai fighters
The Most Powerful Number
Is there any chance a man can get the death penalty for causing a miscarriage?
Are there any German nonsense poems (Jabberwocky)?
Why would a rational buyer offer to buy with no conditions precedent?
Final exams: What is the most common protocol for scheduling?
Navigating a quick return to previous employer
USPS Back Room - Trespassing?
Burned out due to current job, Can I take a week of vacation between jobs?
shell script is not executed after adding it as a crontab job
What could a self-sustaining lunar colony slowly lose that would ultimately prove fatal?
Are cells guaranteed to get at least one mitochondrion when they divide?
Why did Jon Snow do this immoral act if he is so honorable?
Why is unzipped directory exactly 4.0k (much smaller than zipped file)?
Of strange atmospheres - the survivable but unbreathable
Count all vowels in string
Interpreation ROC AUC score
Removing the last element of a list
Can a UK national work as a paid shop assistant in the USA?
How to keep consistency across the application architecture as a team grows?
Why do Russians almost not use verbs of possession akin to "have"?
The Maltese Falcon
Why does Bran want to find Drogon?
Github says that I have changes in my forked repo, but those changes are already merged in the main repo
Git workflow and rebase vs merge questionsRemoving multiple files from a Git repo that have already been deleted from diskPull new updates from original GitHub repository into forked GitHub repositoryThrow away local commits in GitSend a pull request on GitHub for only latest commitHow do I properly force a Git push?Cannot push to GitHub - keeps saying need mergeDelete forked repo from GitHubPlease enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branchVarious ways to remove local Git changes
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty height:90px;width:728px;box-sizing:border-box;
I did the following:
- Forked a repo in github
- Commited a change on my forked repo
- Created a PR in order to merge changes to the original repo
- PR got merged
After doing this, the changes were merged in the original repo, and I got last changes done on the upstream repo using the Github tool for comparing repos. After doing this, if I click on "Compare" button, it shows my change as a difference. Why this is happening? If the same change is in both repos, they should be equal in content, right?
I deleted my forked repo and forked the original repo again, but that wasn't cool, I would like to know what is really happening :)
git github
|
show 1 more comment
I did the following:
- Forked a repo in github
- Commited a change on my forked repo
- Created a PR in order to merge changes to the original repo
- PR got merged
After doing this, the changes were merged in the original repo, and I got last changes done on the upstream repo using the Github tool for comparing repos. After doing this, if I click on "Compare" button, it shows my change as a difference. Why this is happening? If the same change is in both repos, they should be equal in content, right?
I deleted my forked repo and forked the original repo again, but that wasn't cool, I would like to know what is really happening :)
git github
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08
|
show 1 more comment
I did the following:
- Forked a repo in github
- Commited a change on my forked repo
- Created a PR in order to merge changes to the original repo
- PR got merged
After doing this, the changes were merged in the original repo, and I got last changes done on the upstream repo using the Github tool for comparing repos. After doing this, if I click on "Compare" button, it shows my change as a difference. Why this is happening? If the same change is in both repos, they should be equal in content, right?
I deleted my forked repo and forked the original repo again, but that wasn't cool, I would like to know what is really happening :)
git github
I did the following:
- Forked a repo in github
- Commited a change on my forked repo
- Created a PR in order to merge changes to the original repo
- PR got merged
After doing this, the changes were merged in the original repo, and I got last changes done on the upstream repo using the Github tool for comparing repos. After doing this, if I click on "Compare" button, it shows my change as a difference. Why this is happening? If the same change is in both repos, they should be equal in content, right?
I deleted my forked repo and forked the original repo again, but that wasn't cool, I would like to know what is really happening :)
git github
git github
edited Mar 25 at 1:16
chomp
asked Mar 23 at 23:16
chompchomp
735926
735926
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08
|
show 1 more comment
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08
|
show 1 more comment
0
active
oldest
votes
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%2f55319256%2fgithub-says-that-i-have-changes-in-my-forked-repo-but-those-changes-are-already%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
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%2f55319256%2fgithub-says-that-i-have-changes-in-my-forked-repo-but-those-changes-are-already%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
You probably didn’t need to delete your fork. Did you ever update your local repo after the original repo merged the PR?
– evolutionxbox
Mar 24 at 1:52
I synced my github repo with a lot of changes from the repo that was forked in the first place. Directly from github. But the problem remains, that's why I ended up deleting it and forking again.
– chomp
Mar 24 at 5:12
You say clicked “compare”. What branches are you comparing?
– evolutionxbox
Mar 24 at 9:05
I compared master branches on both repos.
– chomp
Mar 24 at 21:05
It’s likely that your master branch wasn’t updated with the upstream repo.
– evolutionxbox
Mar 24 at 22:08