On Thu, 2007-02-01 at 08:11 -0700, Brian Paul wrote: > Keith Whitwell wrote: > > I'd like to consider merging the vbo branch in the next few days. If > > you want to do some testing of it before the merge, I'd suggest doing so > > soon & getting me feedback/bug reports.
No issues here with light testing, FWIW. > Incidentally, I'll probably merge the glsl-compiler-1 branch sometime in > the coming weeks. > > Any tips/lessons learned from doing a large-ish git merge would be > appreciated... It should be much smoother sailing than merging CVS branches. :) From a clean master checkout, git-pull . glsl-compiler-1 does the merge. In the likely event of conflicts, git-status shows which files have conflicts, and git-diff shows only the actual conflicts. After fixing them, mark the edited files for commit with git-update-index and finally commit the merge as usual with git-commit. In case of trouble, you can always go back to clean master with git-reset --hard, but note that this will also discard any uncommitted local changes (which are probably a bad idea for the merge anyway though). Hope this helps, good luck, -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
