On 08/31/2010 12:35 PM, Miguel A. Figueroa-Villanueva wrote: > I take it this is the preferred way, right?
Yes. We're considering making it the *only* way, but first I need to figure out how to clearly document the conflict case mentioned earlier in this thread. > I also take it that we are supposed to merge to master in the stage > repo? I mean, from reading the "Finishing a Topic" section: > > ---- > After development of the topic has been finished and it is considered stable. > > Merge it to master: > > $ ssh g...@public.kitware.com stage repo merge -b master topic-name > Fetching upstream master > Merge branch topic-name > Pushing upstream master > To ../../repo.git > Deleting fully merged topic topic-name (27c71e8) from stage. > ---- > > Or is this something you guys handle? We handle that for CMake's master. The documentation you reference is the general stage documentation not specific to any project. -Brad _______________________________________________ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
