On Tue, Dec 01, 2009 at 06:45:44PM +0000, Keith Whitwell wrote: > I think where we'd hit trouble is if there were two sets of large > changes, each of which only one person properly understood. Ideally > there would be some way to collaborate on merges, but failing that I > guess one or two people should try and stay aware of what's going on > over the whole tree.
Actually you can collaborate on merges, it's just a manual process: Assume you have unmerged changes A1 to An which can only be merged by person A and B1 to Bn which can only be merged by B. Then A does $ git checkout master $ git merge <refspec for An> ... clean up any conflicts ... $ git push Then B can easily merge B1 to Bn in the usual way. -Daniel -- Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48 ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
