On Fri, 2007-02-02 at 07:31 -0700, Brian Paul wrote: > Michel Dänzer wrote: > > > > 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). > > I was thinking I'd like to first merge the trunk into my branch so that > I can get all the latest driver updates and see what I might have broken. > > So would that just be a 'git pull origin .' from in my glsl-compiler-1 > branch, then git-commit?
Yes, that is git-pull . origin >From git's point of view, there's basically no difference between merging A onto B or B onto A (except for which branch the result ends up on, obviously :). -- 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
