After many hours of searching for this particular problem, I did not find another solution, but I posed the question here:
Scenario:
- Two remote servers: git.address-a.com and git.address-b.com
- One local repository with two remotes: origin to git.address-a.com and remote-b to git.Address-b.com
- Every day I check if something has been pressed on remote-b .
- If something has been clicked, I create a new local branch based on the master ( origin / master tracking), select the changes from remote-b and merge them into my new branch ( branch-b ).
- If everything is in order and there is no conflict (I will correct them manually, if any), I will just go back to master and merged with branch-b , so I click master on origin / master .
Description of the problem:
This workflow worked very well, but for some reason, last week with daily integration, git only returned me a push message:
error: unpack failed: error Missing commit 041460e3edf2f00f75022ce864535ffa2331f1c3 To https:// myuser@git.address-a.com /git/r/project.git ! [remote rejected] master -> master (n/a (unpacker error))
This fixation (shorted: 041460) comes from two weeks ago and exists in both remotes . But now, when I receive and merge the changes from remote-b to branch-b , merge it with master and try to click the origin this error is displayed.
The executed commands:
#git checkout -b branch-b
Enviroment:
Git in remotes: 1.7.1 Git in my car: 1.9.1 Gitblit 1.6.2 in both remotes
I tried:
- Rebase
- Insert the parent of the message reported using git and replace it after.
- Delete the local project, repeat all the integration steps again.
git version-control merge git-merge git-push
Diogo paschoal
source share