Hi Ulrich, Am 22.10.10 04:32, schrieb Ulrich Hertlein: >> This should work, too: >> git clone git://github.com/stmh/osg.git >> git pull origin iphone > > This is giving me a heap of conflicts (on a clean checkout/clone) along the > lines of > From git://github.com/stmh/osg > * branch iphone -> FETCH_HEAD > CONFLICT (rename/delete): Rename > IPhone_Project/osgPlugins/imageio/ReaderWriterImageIO.cpp->src/osgPlugins/imageio/ReaderWriterImageIO_IPhone.cpp > in b79883a69545f82a573ec8aaa350262b3dedf4b1 and deleted in HEAD > CONFLICT (delete/modify): IPhone_Project/OSGIPhone.xcodeproj/hogbox.mode1v3 > deleted in > HEAD and modified in b79883a69545f82a573ec8aaa350262b3dedf4b1. Version > b79883a69545f82a573ec8aaa350262b3dedf4b1 of > IPhone_Project/OSGIPhone.xcodeproj/hogbox.mode1v3 left in tree. > CONFLICT (delete/modify): IPhone_Project/OSGIPhone.xcodeproj/hogbox.pbxuser > deleted in > HEAD and modified in b79883a69545f82a573ec8aaa350262b3dedf4b1. Version > b79883a69545f82a573ec8aaa350262b3dedf4b1 of > IPhone_Project/OSGIPhone.xcodeproj/hogbox.pbxuser left in tree. > ... > > The 'git clone, git branch, git checkout' that Florian described above works > however... > > (I absolutely haven't got my head around git at all yet, so this might be a > case of user > error.) > > Or am I using the wrong repository?
No the repo is fine. My experience with git is also limited and I did some mistakes when checking stuff into the master-branch in the past. (I did a "git push origin master" from my iphone-branch which pushed the iphone-related stuff into the master-branch. After I realized my fault, I couldn't revert the change, so I deleted the iPhone-specific stuff from this branch. I am still looking for a way to reset the master branch to a specific version on github.) Be sure to pull into the right branch e.g. git clone git://github.com/stmh/osg.git cd osg #switch to the iphone-branch git checkout iphone #pull new changes git pull origin iphone cheers, Stephan _______________________________________________ osg-users mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
