Hi guys, On 27/07/10 18:23 , Stephan Huber wrote: > Am 23.07.10 18:25, schrieb Florian Kolbe: >> Hi, >> I am very delighted to see that the porting is making progress, and I would >> like to >> contribute. Here are my experiences so far: >> >> I did the following to get the code: >> >> Code: >> git clone http://github.com/stmh/osg.git >> cd osg >> git branch -a >> git checkout remotes/origin/iphone > > i am by no means a git expert, I used the tutorial at > http://www.openscenegraph.org/projects/osg/wiki/Downloads/GIT to get the > source. > > 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? Cheers, /ulrich _______________________________________________ osg-users mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
