Hello Yarko, thanks for answering.
> The process you describe for contributing either risks overwriting > web2py-sphinx changes, or assumes that both devel and web2py-sphinx branches > are already in sync; As stated earlier, I do not have experience with concerted development and such merges. The highest I did was merging local commits in the remote repository. > After you once have a branch of web2py-sphinx, and a pull of devel, I think > you will need to merge web2py-sphinx with devel before beginning to make > changes destined for web2py-devel. My idea was to 1) remove all errors of the new docs (excluding API, wiki FAQ) 2) then pull the latest devel 3) copy the docs over 4) commit and push to my repo 5) propose a merge with the web2py mainline. If you are sure, I will update the docs later this day. > Something like that, don't you think? Thanks for looking at the docs! Regards, Timmie --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to web2py@googlegroups.com To unsubscribe from this group, send email to web2py+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
