[1][email protected] wrote: "BRUNO CESAR RIBAS":
Could you try to clone [2]...@git:aufs/aufs2-2.6-test.git (it is a clean kernel 2.6 clone) so you can merge your diferences and branches. I did cloned aufs2-2.6-test.git, but I don't know how to merge my local branches. I *think* you should do something like: git remote add origin that-new-repo git push origin some-local-branch ..repeat step above.. At the end of this you have now pushed all your local branches up to the new repo that you want him to have (obviously don't push anything which is local only) I tired pushing local aufs2-2.6.git to remote aufs2-2.6-test.git. It succeeded except master branch. That's probably because master on that other repo was really some other completely different branch - forcing it might not have been the best solution? Basically git push is just pushing up a selected tree from your local repo - it matches names locally and on the remote by default and assumes they are related, but they don't have to be (wierd stuff my happen in this situation). Remember you can rename remote branches and also delete remote branches - at the end of the day there is no great difference between a remote repo and a local repo in some directory. Also pulling changes down or pushing them up really vary in quite subtle ways and depend which end of the connection you have control of... This might be interesting: [3]http://github.com/guides/remove-a-remote-branch If aufs2-2.6-test.git is ok, then is everything ok if you rename it to aufs2-2.6.git on your side? Note YOU can do this! By the way, I have tried git-fsck for my local tree, and it reported many 'daggling' things. With --lost-found option, they were all moved to lost-found/ subdir. Can it be the root cause of the problem? Dangling entries just mean commits which can't be reached by any current branch They occur because git is WAY cleverer than anyone gives it credit. When you delete some branch or rollback and delete some commits (or use the stash) then even though you kind of deleted some commits, git actually won't let you completely shoot yourself in the foot and instead it keeps those commits lying around "for a bit". They are only finally cleaned up if you do a "git gc" Search google a bit and read the git-gc man pages for more, but basically git is incredibly clever and it tries to help you out if you a) commit, b) rollback/delete a branch, c) suddenly wish you hadn't deleted all those commits and want to recover them! Good luck Ed W References 1. mailto:[email protected] 2. mailto:g...@git:aufs/aufs2-2.6-test.git 3. http://github.com/guides/remove-a-remote-branch
------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference
