Sebastian Kuzminsky wrote: > On 7/8/13 10:18 , Jon Elson wrote: > >> Sebastian Kuzminsky wrote: >> >>> Merge remote-tracking branch 'origin/v2.5_branch' >>> >>> >> Thanks, Seb! Should I be doing this myself, or is this a manager >> function? (So much I don't know about git and our procedures...) >> > > You're welcome to do it, but not required. > > I don't mind merging your stuff along with mine the next time i merge, > and if something about your part of the merge is tricky i know where to > find you to ask for your help with it ;-) > Hopefully my changes are very limited and specific to PPMC hardware, and not too many others are committing changes to it. So, there shouldn't be much tricky stuff (I hope). > See "man gitworkflows", the "Merging upwards" section for a description > of how we run our branches. > Thanks for the pointer, i will have to read this.
Now, I have to get the docs to follow these updates (and also to bring them up to date on a lot of other matters, as well.) Are we keeping separate docs that are in sync with the release versions, and should I treat commits there the same as commits to the code? (I know the doc files in master get rebuilt periodically, is the same true for the branches?) Thanks, Jon ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
