Short version of my question : For years, I have been using a simple, single one-branch, one-contributor public online Github repo. An attempt to pull the remote changes to local using git pull resulted into this error. We thank you and appreciate you being our subscriber and wish all the best in your coding journey. I added this error to my to do list for searching it later. A remote origin was added. The git bundle that propellor is trying to merge is indeed an unrelated history it gets generated from scratch when I build the propellor package.
With this, you lose all the commits you have been making while updating local repository before the. A few days ago my computer died suddenly and I bought a new one. It seems the git 2. You local history is gone and git is not happy with it. Patch attached, which I'm forwarding upstream and will apply to Debian in the meantime. Please turn if off in order to continue. Integrate the remote changes e.
Delta compression using up to 4 threads. Seemed to work, output the following : Branch 'master' set up to track remote branch 'master' from 'origin'. Got the following message : warning: no common commits remote: Counting objects: 11450, done. As clear from the error message, it happens when some one try to merge two unrelated projects projects which do not know about each other and commit history in one project does not match with other project. So the error makes sense. See git-pull 1 for details. Please specify which branch you want to merge with.
I have sketched it on white board apologies for bad image quality. Yes, but usually, I prepare my configuration on the targetted machine. We have searched a bit and solved it using --allow-unrelated-histories switch with pull command. From now onwards you will read what I have learnt. Got the following error message : fatal: The current branch master has no upstream branch.
. Our website serves minimal ads, to keep your learning experience optimal. You may want to first integrate the remote changes hint: e. This is usually caused by another repository pushing hint: to the same ref. Unrelated histories can be fixed in two ways. Here are the steps you need to follow.
This will merge remote history first followed by your commit. Until now I am aware of two scenarios when this error can occur. I was unaware of the consequences and origin of this error. Total 4785 delta 1168 , reused 0 delta 0 To 31cac34. Local git repository was initialized using git init. Yes exactly I rebuild the propellor on my jessie machines.
Not committing merge; use 'git commit' to complete the merge. . . . . .
. . . . . . .
. . . . . .