So, I decided it would be neat to merge all the changes that have
occurred on the Mesa mainline to the vbo branch where I've started
working again.
Naively, I thought something simple like:
git checkout vbo_0_1_branch
git pull
Would do the trick, but that has given me a gazillion conflicts in crazy
places like the svga driver and what-have-you. Presumably some of these
are artifacts of the CVS->git import and the fact that I'm playing on a
branch that was originally created under CVS and has been pulled in as
part of the import.
What is the way forward? I'm pretty happy to create a new branch and
drop the code into that, if necessary, but I'd like to know that my
pulling problems will be over in that case.
Keith
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
