You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.
To propose PRs to the upstream I maintain a branch upstream-main, with identical history of main branch o the upstream.
I just tried to update this branch and it said:
ulvida@paname:~/tech/interior/UdelaRInterior/udelarinterior.bind9$ git status
On branch upstream-main
Your branch is up to date with 'origin/upstream-main'.
nothing to commit, working tree clean
ulvida@paname:~/tech/interior/UdelaRInterior/udelarinterior.bind9$ git remote -v
origin [email protected]:UdelaRInterior/ansible-role-bind9.git (fetch)
origin [email protected]:UdelaRInterior/ansible-role-bind9.git (push)
upstream https://github.com/systemli/ansible-role-bind9.git (fetch)
upstream https://github.com/systemli/ansible-role-bind9.git (push)
ulvida@paname:~/tech/interior/UdelaRInterior/udelarinterior.bind9$ git pull upstream main
From https://github.com/systemli/ansible-role-bind9
* branch main -> FETCH_HEAD
fatal: refusing to merge unrelated histories
I tried even to create a new branch at the initial commit to recreate upstream main, but there I realize we have a different hash of the initial commit in our repo:
To propose PRs to the upstream I maintain a branch
upstream-main
, with identical history of main branch o the upstream.I just tried to update this branch and it said:
I tried even to create a new branch at the initial commit to recreate upstream main, but there I realize we have a different hash of the initial commit in our repo:
and the upstream repo :
How could this happen? One of us did very dirty epo management?
The text was updated successfully, but these errors were encountered: